diff --git a/flake.lock b/flake.lock index dfa8dd02..60fec314 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1719923187, - "narHash": "sha256-833SF50YnN1Hj3qdUmadt9A7XtFWG3BnwQMyxcXIex4=", + "lastModified": 1720009717, + "narHash": "sha256-HICfiksmANfwC0UaoFJ3L6mLV/mObx6Ad4OtT0w22Zw=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "9e77774f2eeab583dbff4127a11287061a947538", + "rev": "a78c64a4dabce5e65361bafc6c1508981c385d71", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1719992360, + "narHash": "sha256-SRq0ZRkqagqpMGVf4z9q9CIWRbPYjO7FTqSJyWh7nes=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "36e2f9da91ce8b63a549a47688ae60d47c50de4b", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1719913883, - "narHash": "sha256-GHB5lizmXGlglKYAKIvY9bkPcXvbrmEzh4d264omYYo=", + "lastModified": 1719971132, + "narHash": "sha256-/u/dRd43l8WHW8WIEAtMf4KnayefCLpB3VpLF2FBEno=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0289cf03e294270c84f20bc09cd527fd7f3d4b72", + "rev": "97bbe0cc1dc3d8962a9d15404a3c41da0ad2a3b3", "type": "github" }, "original": { @@ -459,11 +459,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719827289, - "narHash": "sha256-0IcxmkzmNY4el9yx7wGjZ+VDLGV+3XlI6AW9WfCbzAM=", + "lastModified": 1719963642, + "narHash": "sha256-2+K/i8t4FkGCHEanISE8Q/SbLmWKp1dtpGlf44/x4m0=", "owner": "neovim", "repo": "neovim", - "rev": "8f5e90811025bcc652146168d5116f8d73fe8f81", + "rev": "d413038b4fd71b7a335b6653aa64d2cb6daeac7b", "type": "github" }, "original": { @@ -521,11 +521,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1719838683, - "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", + "lastModified": 1719956923, + "narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", + "rev": "706eef542dec88cc0ed25b9075d3037564b2d164", "type": "github" }, "original": { diff --git a/home/core/gui/default.nix b/home/core/gui/default.nix index 7ac80450..c6f241ff 100644 --- a/home/core/gui/default.nix +++ b/home/core/gui/default.nix @@ -9,13 +9,6 @@ ./rofi.nix ]; - xdg.portal = let - hyprland = config.wayland.windowManager.hyprland.package; - xdph = pkgs.xdg-desktop-portal-hyprland.override {inherit hyprland;}; - in { - extraPortals = [xdph]; - configPackages = [hyprland]; - }; home.packages = with pkgs; [ grimblast slurp @@ -24,19 +17,4 @@ tofi gnome.gnome-calculator ]; - wayland.windowManager.hyprland = { - enable = true; - package = pkgs.hyprland; - xwayland.enable = true; - extraConfig = '' - ${builtins.readFile ./hyprland.conf} - ''; - systemd = { - enable = true; - extraCommands = [ - "systemctl --user stop graphical-session.target" - "systemctl --user start hyprland-session.target" - ]; - }; - }; } diff --git a/home/core/gui/hyprland.conf b/home/core/gui/hyprland.conf deleted file mode 100644 index d63e0e49..00000000 --- a/home/core/gui/hyprland.conf +++ /dev/null @@ -1,7 +0,0 @@ -# HYPRLAND CONFIGURATION - -source=./land/appearance.conf -source=./land/inputs.conf -source=./land/keybinds.conf -source=./land/rules.conf -source=./land/startup.conf diff --git a/home/core/gui/rofi.nix b/home/core/gui/rofi.nix index edbe2cc7..0c4dbaf3 100644 --- a/home/core/gui/rofi.nix +++ b/home/core/gui/rofi.nix @@ -2,7 +2,7 @@ programs.rofi = { enable = true; package = pkgs.rofi-wayland-unwrapped; - configPath = "$XDG_CONFIG_HOME/rofi/config.rasi"; + configPath = "home/cnst/.config/rofi/config.rasi"; font = "Rec Mono Linear 11"; }; } diff --git a/home/core/shell/cnst.nix b/home/core/shell/cnst.nix index f369b267..92e5b700 100644 --- a/home/core/shell/cnst.nix +++ b/home/core/shell/cnst.nix @@ -9,10 +9,10 @@ shellAliases = { nixconfig = "cd /home/cnst/.nix-config/"; ll = "ls -l"; - nixupdate = "sudo nixos-rebuild switch -v --show-trace --flake .#cnix"; - nixup = "sudo nixos-rebuild switch --flake .#cnix"; - flakeupdate = "nix flake update"; - flakeup = "nix flake update"; + nixupdate = "nh os switch -v -H cnix"; + nixup = "nh os switch -H cnix"; + flakeupdate = "nh os switch -u -v -H cnix"; + flakeup = "nh os switch -u -H cnix"; }; history = { size = 1000; diff --git a/home/extra/cnst.nix b/home/extra/cnst.nix index 48516f1e..8d289394 100644 --- a/home/extra/cnst.nix +++ b/home/extra/cnst.nix @@ -7,7 +7,6 @@ ./kitty ./firefox ./neovim - ./lutris ./mako ]; home.packages = with pkgs; [ diff --git a/hosts/cnix/default.nix b/hosts/cnix/default.nix index f16cc39f..e3d4fa49 100644 --- a/hosts/cnix/default.nix +++ b/hosts/cnix/default.nix @@ -31,6 +31,7 @@ in { inputs.home-manager.nixosModules.home-manager ../core ../extra/steam + ../extra/lutris ../extra/nix-ld ../extra/workstation ../extra/gamemode @@ -83,6 +84,10 @@ in { hostName = "cnix"; }; + environment.sessionVariables = { + FLAKE = "/home/cnst/.nix-config"; + }; + # Garbage collector / Nix helper programs = { nh = { diff --git a/hosts/cnix/xkb/symbols/hhkbse b/hosts/cnix/xkb/symbols/hhkbse index c2c387d5..f636b3d4 100644 --- a/hosts/cnix/xkb/symbols/hhkbse +++ b/hosts/cnix/xkb/symbols/hhkbse @@ -5,20 +5,20 @@ xkb_symbols "hhkbse" { name[Group1]="Sweden - HHKBse"; - key {[ 1, exclam, paragraph, onehalf ]}; - key {[ 2, quotedbl, at ]}; + key {[ 1, exclam, section, onehalf ]}; + key {[ 2, quotedbl, at, paragraph ]}; key {[ 3, numbersign, sterling ]}; key {[ 4, dollar, currency ]}; - key {[ 5, percent, EuroSign ]}; + key {[ 5, percent, EuroSign, permille ]}; key {[ 6, ampersand, yen, radical ]}; key {[ 7, slash, braceleft ]}; key {[ 8, parenleft, bracketleft ]}; key {[ 9, parenright, bracketright ]}; key {[ 0, equal, braceright ]}; - key {[ plus, question, backslash, questiondown ]}; + key {[ plus, question, backslash, plusminus ]}; key {[ Next, braceleft, Home ]}; key {[ Prior, braceright, End ]}; - key {[ Delete, asterisk, asciicircum ]}; + key {[ Delete,asciicircum, asterisk ]}; key {[ q, Q ]}; key {[ w, W ]}; @@ -50,8 +50,8 @@ xkb_symbols "hhkbse" { key {[ v, V ]}; key {[ b, B ]}; key {[ n, N ]}; - key {[ m, M, mu ]}; + key {[ m, M ]}; key {[ comma, semicolon ]}; - key {[ period, colon ]}; + key {[ period, colon, ellipsis ]}; key {[ minus, underscore, endash ]}; }; diff --git a/hosts/core/cnix-pkgs.nix b/hosts/core/cnix-pkgs.nix index a17e11e4..f7a3d468 100644 --- a/hosts/core/cnix-pkgs.nix +++ b/hosts/core/cnix-pkgs.nix @@ -1,17 +1,34 @@ {pkgs, ...}: { environment = { - systemPackages = [ + systemPackages = with pkgs; [ # Dev - pkgs.fd - pkgs.python3 - pkgs.hyprlang + fd + python3 + hyprlang # Util - pkgs.tmux - pkgs.tmuxifier + tmux + tmuxifier # Misc - pkgs.protonup + protonup + + # Lutris dependencies + (lutris.override { + extraLibraries = pkgs: [ + SDL2 + SDL2_image + glib + egl-wayland + wineWowPackages.stable + wineWowPackages.staging + wineWowPackages.waylandFull + winetricks + python312Packages.pygame-sdl2 + libGL + ffmpeg + ]; + }) ]; sessionVariables = { STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d"; diff --git a/hosts/extra/lutris/default.nix b/hosts/extra/lutris/default.nix new file mode 100644 index 00000000..b156c28c --- /dev/null +++ b/hosts/extra/lutris/default.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + lutris + ]; +}