diff options
| -rw-r--r-- | flake.lock | 4 | ||||
| -rw-r--r-- | machines/common/base.nix | 1 | ||||
| -rw-r--r-- | machines/common/steam.nix | 35 | ||||
| -rw-r--r-- | machines/common/user.nix | 1 | ||||
| -rw-r--r-- | machines/hierophant/configuration.nix | 20 | ||||
| -rw-r--r-- | users/kassouni/desktop/sway/sway.nix | 11 | ||||
| -rw-r--r-- | users/kassouni/firefox/firefox.nix | 1 | ||||
| -rw-r--r-- | users/kassouni/fonts.nix | 8 | ||||
| -rw-r--r-- | users/kassouni/git.nix | 1 | ||||
| -rw-r--r-- | users/kassouni/home.nix | 3 | ||||
| -rw-r--r-- | users/kassouni/music.nix | 13 |
11 files changed, 93 insertions, 5 deletions
@@ -332,8 +332,8 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1788239526, - "narHash": "sha256-wNoWALnRqwCmDFct8ADoNtNsS5ihtobMy2WKVTeZw5A=", + "lastModified": 1787898838, + "narHash": "sha256-FYW+vDL/Aw4KGcyKz4Y26lQ9JpjAOVNBDGrEQlskaa4=", "path": "/home/kassouni/Developer/xmonad-config", "type": "path" }, diff --git a/machines/common/base.nix b/machines/common/base.nix index 5e2c091..fbef8ae 100644 --- a/machines/common/base.nix +++ b/machines/common/base.nix @@ -15,6 +15,7 @@ programs.steam.enable = true; hardware.steam-hardware.enable = true; + programs.gamescope.enable = true; time.timeZone = "America/Los_Angeles"; i18n.defaultLocale = "en_US.UTF-8"; diff --git a/machines/common/steam.nix b/machines/common/steam.nix new file mode 100644 index 0000000..aa4ad84 --- /dev/null +++ b/machines/common/steam.nix @@ -0,0 +1,35 @@ +{lib, pkgs, ...}: { + users.users.steam = { + isNormalUser = true; + uid = 1001; + home = "/home/steam"; + extraGroups = [ + "wheel" + "video" + "docker" + "input" + "audio" + ]; + }; + + programs = { + gamescope = { + enable = true; + capSysNice = true; + }; + steam.gamescopeSession.enable = true; + }; + + programs.steam.enable = true; + hardware.steam-hardware.enable = true; + + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${lib.getExe pkgs.gamescope} -W 3840 -H 2160 -f -e --xwayland-count 2 --hdr-enabled --hdr-itm-enabled -- steam -pipewire-dmabuf -gamepadui -steamdeck -steamos3 > /dev/null 2>&1"; + user = "steam"; + }; + }; + }; +} diff --git a/machines/common/user.nix b/machines/common/user.nix index adac815..7fe33a8 100644 --- a/machines/common/user.nix +++ b/machines/common/user.nix @@ -1,6 +1,7 @@ {...}: { users.users.kassouni = { isNormalUser = true; + uid = 1000; home = "/home/kassouni"; extraGroups = [ "wheel" diff --git a/machines/hierophant/configuration.nix b/machines/hierophant/configuration.nix index 01a2d25..8e04e44 100644 --- a/machines/hierophant/configuration.nix +++ b/machines/hierophant/configuration.nix @@ -1,4 +1,5 @@ { + config, pkgs, ... }: @@ -20,6 +21,25 @@ xrandr --output DP-0 --mode 3840x2160 --rate 159.98 ''; + fileSystems."/mnt/bertha" = + let + user = config.users.users.kassouni; + in + { + device = "/dev/disk/by-label/Bertha"; + fsType = "exfat"; + noCheck = true; + options = [ + "nofail" + "noauto" + "x-systemd.automount" + "x-systemd.idle-timeout=600" + "uid=${toString user.uid}" + "gid=${toString config.users.groups.${user.group}.gid}" + "umask=022" + ]; + }; + networking.hostName = "hierophant"; # This option defines the first version of NixOS you have installed on this particular machine, diff --git a/users/kassouni/desktop/sway/sway.nix b/users/kassouni/desktop/sway/sway.nix index f949bd7..c41e62a 100644 --- a/users/kassouni/desktop/sway/sway.nix +++ b/users/kassouni/desktop/sway/sway.nix @@ -1,6 +1,8 @@ { pkgs, + lib, config, + osConfig, ... }: let @@ -12,6 +14,8 @@ in enable = true; wrapperFeatures.gtk = true; # Fixes common issues with GTK 3 apps + extraOptions = [ "--unsupported-gpu" ]; + config = { window.titlebar = false; menu = "fuzzel"; @@ -39,6 +43,13 @@ in natural_scroll enabled dwt disabled } + + input "type:pointer" { + accel_profile flat + pointer_accel 0.2 + } + '' + lib.optionalString (osConfig.networking.hostName == "hierophant") '' + output DP-3 mode 3840x2160@159.975Hz ''; }; diff --git a/users/kassouni/firefox/firefox.nix b/users/kassouni/firefox/firefox.nix index 2d9f906..4e70296 100644 --- a/users/kassouni/firefox/firefox.nix +++ b/users/kassouni/firefox/firefox.nix @@ -37,6 +37,7 @@ settings = { "browser.ml.linkPreview.enabled" = false; "browser.startup.homepage" = "about:blank"; + "browser.uidensity" = 1; "browser.compactmode.show" = true; "startup.homepage_welcome_url" = "about:blank"; "extensions.autoDisableScopes" = 0; diff --git a/users/kassouni/fonts.nix b/users/kassouni/fonts.nix index d6d40f7..2cf25f6 100644 --- a/users/kassouni/fonts.nix +++ b/users/kassouni/fonts.nix @@ -1,6 +1,12 @@ {pkgs, ...}: { - fonts.fontconfig.enable = true; + fonts.fontconfig = { + enable = true; + defaultFonts.emoji = [ "OpenMoji" ]; + }; + home.packages = with pkgs; [ dejavu_fonts + noto-fonts + openmoji-color ]; } diff --git a/users/kassouni/git.nix b/users/kassouni/git.nix index 7740ac1..eb87201 100644 --- a/users/kassouni/git.nix +++ b/users/kassouni/git.nix @@ -10,6 +10,7 @@ init = { defaultBranch = "main"; }; + advice.addIgnoredFile = false; }; }; } diff --git a/users/kassouni/home.nix b/users/kassouni/home.nix index d9e389d..a5d7c85 100644 --- a/users/kassouni/home.nix +++ b/users/kassouni/home.nix @@ -30,11 +30,14 @@ home.username = "kassouni"; home.sessionVariables = { "TEST_VAR" = "asdf"; + "NIXOS_OZONE_WL" = "1"; }; home.packages = with pkgs; [ dolphin-emu cmus + vscode + discord btop wget tree diff --git a/users/kassouni/music.nix b/users/kassouni/music.nix index 65a9edb..e20e0d4 100644 --- a/users/kassouni/music.nix +++ b/users/kassouni/music.nix @@ -1,4 +1,8 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +let + musicDir = "~/Music/beets/library"; +in +{ home.packages = with pkgs; [ cdparanoia-iii ffmpeg @@ -6,6 +10,11 @@ imagemagick ]; + services.mpd = { + enable = true; + musicDirectory = musicDir; + }; + programs.beets = { enable = true; settings = { @@ -27,7 +36,7 @@ maxwidth = 500; }; - directory = "~/Music/beets/library"; + directory = musicDir; library = "~/Music/beets/musiclibrary.db"; }; }; |