diff --git a/flake.lock b/flake.lock index 816d0cb3..ec2c2b7b 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1731496216, - "narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=", + "lastModified": 1737636397, + "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59", + "rev": "7fe006981fae53e931f513026fc754e322f13145", "type": "github" }, "original": { @@ -447,11 +447,11 @@ ] }, "locked": { - "lastModified": 1738178255, - "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=", + "lastModified": 1737634937, + "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82", + "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", "type": "github" }, "original": { @@ -461,6 +461,35 @@ } }, "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737634889, + "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprgraphics_2": { "inputs": { "hyprutils": [ "hyprlock", @@ -493,8 +522,10 @@ "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", + "hyprland-qtutils": "hyprland-qtutils", + "hyprlang": "hyprlang_2", "hyprutils": [ "hyprutils" ], @@ -507,20 +538,18 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731526492, - "narHash": "sha256-2Gob+eZEPpF225QrRLXyfeQ9L63YHFa/tNh15FW/Rzo=", - "ref": "refs/heads/main", - "rev": "3fb47372b79265ebdabeeefdad10359d5b18377a", - "revCount": 5451, - "submodules": true, - "type": "git", - "url": "https://code.hyprland.org/hyprwm/Hyprland.git" + "lastModified": 1738457237, + "narHash": "sha256-9mtM+lwnmXnv5TPmdij1rR5fLzzqSjkltcyEuRf8uIk=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", + "type": "github" }, "original": { - "rev": "3fb47372b79265ebdabeeefdad10359d5b18377a", - "submodules": true, - "type": "git", - "url": "https://code.hyprland.org/hyprwm/Hyprland.git" + "owner": "hyprwm", + "ref": "v0.47.2", + "repo": "Hyprland", + "type": "github" } }, "hyprland-protocols": { @@ -535,11 +564,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "type": "github" }, "original": { @@ -548,7 +577,95 @@ "type": "github" } }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737811848, + "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { + "inputs": { + "hyprutils": "hyprutils", + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { "inputs": { "hyprutils": [ "hyprland", @@ -564,11 +681,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", "type": "github" }, "original": { @@ -577,7 +694,7 @@ "type": "github" } }, - "hyprlang_2": { + "hyprlang_3": { "inputs": { "hyprutils": [ "hyprlock", @@ -608,8 +725,8 @@ }, "hyprlock": { "inputs": { - "hyprgraphics": "hyprgraphics", - "hyprlang": "hyprlang_2", + "hyprgraphics": "hyprgraphics_2", + "hyprlang": "hyprlang_3", "hyprutils": [ "hyprutils" ], @@ -635,6 +752,37 @@ } }, "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "hyprland-qt-support", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -642,16 +790,15 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1736164519, - "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", + "lastModified": 1739048933, + "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", "ref": "refs/heads/main", - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", - "revCount": 70, + "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", + "revCount": 84, "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprutils.git" }, "original": { - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprutils.git" } @@ -668,11 +815,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -784,22 +931,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1738163270, "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", @@ -861,6 +992,29 @@ "type": "github" } }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736549395, + "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=", + "owner": "nix-community", + "repo": "plasma-manager", + "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "plasma-manager", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -868,15 +1022,14 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -893,9 +1046,10 @@ "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprlock": "hyprlock", - "hyprutils": "hyprutils", + "hyprutils": "hyprutils_2", "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs-stable": "nixpkgs-stable_2", + "plasma-manager": "plasma-manager", "rust-overlay": "rust-overlay", "secrets": "secrets", "stylix": "stylix" @@ -1140,11 +1294,11 @@ ] }, "locked": { - "lastModified": 1730743262, - "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0e5bad0c..d1ae5af3 100644 --- a/flake.nix +++ b/flake.nix @@ -85,10 +85,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland = { - type = "git"; - url = "https://code.hyprland.org/hyprwm/Hyprland.git"; - submodules = true; - rev = "3fb47372b79265ebdabeeefdad10359d5b18377a"; #v0.45.0 + url = "github:hyprwm/Hyprland/v0.47.2?submodules=true"; inputs.nixpkgs.follows = "nixpkgs"; inputs.hyprutils.follows = "hyprutils"; }; @@ -96,7 +93,6 @@ hyprutils = { type = "git"; url = "https://code.hyprland.org/hyprwm/hyprutils.git"; - rev = "3c895da64b0eb19870142196fa48c07090b441c4"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -108,6 +104,12 @@ inputs.hyprutils.follows = "hyprutils"; }; + plasma-manager = { + url = "github:nix-community/plasma-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + }; + stylix.url = "github:danth/stylix"; emacs-overlay = { diff --git a/hosts/ori/configuration.nix b/hosts/ori/configuration.nix index dfe3e96b..869f0b07 100644 --- a/hosts/ori/configuration.nix +++ b/hosts/ori/configuration.nix @@ -29,9 +29,14 @@ sshd.enable = true; }; + stylix = { + enable = true; + theme = "tomorrow-night"; + }; + }; - user.users.emmet.openssh.authorizedKeys.keys = [ + users.users.emmet.openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDaeejVJwUVrIZSo1isbu+gkQ7+8ftCgCsczy3OclkEVWHyRTqlG6yp74hr3j8ZNsOhov7c2Q6RqC8oy669hlxi/y9BsvtlI7sBr94oAKFOmkCS4RiK72ngJjBvI0vbk89wQQjmAd3r8B7ZcedpNOC8CkHu8SebKdYPRIUvAbPc3fTEt7DsJkazAepZCB8LEhUp57FAqQ/Ezlt3X/1uwNq5S0EbE9Zm+nUpEfSqR9apY2neKWLyGiCxpK3dzyNOuulCxvtVz+ie2sTk/6SxM+qWEoVVxhdwyxPihEjgC0EvtG0S5mVh5JmcjRkJOzzBHJuw+6r8yWn/AxGdIsoJ4rKNxH1XH1iLHgCraOLOUjUNlmejTcQPu6o92a79fdz2gCHT/BuIjfCW7MErAC3YSmF45TSur/kiWCBaTqYo06pgbQ3w1vKg7fievQlQzsutmg47RvJp6fb74yxuOdVg39cShQu/l8r6zqm21JAeUaaIp4P/0MrAIMOOVUhbK0QgsNElO4yn0ZKH8wGIF8xORh7ikxUIAyq8C41gjJiO2sAFJc3M8DhduQU3X0lHB7U0Qyu+8ZXn05+zdFPXJ73LKc7DCcLkppRXJsdHLSDEFdWqFnV7o08B4qZkPMT4pmvhwhY0Pf1fwavOqxuTstzw18gUGyQzl0foQi0Qrmdazsp2Qw== emmet@snowfire" ]; diff --git a/modules/system/phoenix/default.nix b/modules/system/phoenix/default.nix index 4329ffa2..15217b90 100644 --- a/modules/system/phoenix/default.nix +++ b/modules/system/phoenix/default.nix @@ -15,73 +15,70 @@ }; }; }; -# TODO disabled for debugging -# config = { -# environment.systemPackages = [ -# # TODO update script for config schema change -# (pkgs.writeScriptBin "phoenix" '' -# if [ "$1" = "sync" ]; then -# if [ "$#" = 1 ]; then -# ''+config.systemSettings.dotfilesDir+''/scripts/sync.sh; -# exit 0; -# elif [ "$2" = "user" ]; then -# ''+config.systemSettings.dotfilesDir+''/scripts/sync-user.sh; -# exit 0; -# elif [ "$2" = "system" ]; then -# ''+config.systemSettings.dotfilesDir+''/scripts/sync-system.sh; -# exit 0; -# else -# echo "Please pass 'system' or 'user' if supplying a second argument" -# fi -# elif [ "$1" = "refresh" ]; then -# if [ "$#" -gt 1 ]; then -# echo "Warning: The 'refresh' command has no subcommands (no $2 subcommand)"; -# fi -# ''+config.systemSettings.dotfilesDir+''/scripts/sync-posthook.sh; -# exit 0; -# elif [ "$1" = "update" ]; then -# ''+config.systemSettings.dotfilesDir+''/scripts/update.sh "''${@:2}"; -# exit 0; -# elif [ "$1" = "upgrade" ]; then -# if [ "$#" -gt 1 ]; then -# echo "Warning: The 'upgrade' command has no subcommands (no $2 subcommand)"; -# fi -# ''+config.systemSettings.dotfilesDir+''/scripts/upgrade.sh; -# exit 0; -# elif [ "$1" = "pull" ]; then -# if [ "$#" -gt 1 ]; then -# echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)"; -# fi -# ''+config.systemSettings.dotfilesDir+''/scripts/pull.sh; -# exit 0; -# elif [ "$1" = "harden" ]; then -# if [ "$#" -gt 1 ]; then -# echo "Warning: The 'harden' command has no subcommands (no $2 subcommand)"; -# fi -# ''+config.systemSettings.dotfilesDir+''/scripts/harden.sh; -# exit 0; -# elif [ "$1" = "soften" ]; then -# if [ "$#" -gt 1 ]; then -# echo "Warning: The 'soften' command has no subcommands (no $2 subcommand)"; -# fi -# ''+config.systemSettings.dotfilesDir+''/scripts/soften.sh; -# exit 0; -# elif [ "$1" = "gc" ]; then -# if [ "$#" -gt 2 ]; then -# echo "Warning: The 'gc' command only accepts one argument (collect_older_than)"; -# fi -# if [ "$2" = "full" ]; then -# sudo nix-collect-garbage --delete-old; -# nix-collect-garbage --delete-old; -# elif [ "$2" ]; then -# sudo nix-collect-garbage --delete-older-than $2; -# nix-collect-garbage --delete-older-than $2; -# else -# sudo nix-collect-garbage --delete-older-than 30d; -# nix-collect-garbage --delete-older-than 30d; -# fi -# fi -# '') -# ]; -# }; + config = { + environment.systemPackages = with pkgs; [ + attic-client + (pkgs.writeScriptBin "phoenix" '' + if [ "$1" = "sync" ]; then + if [ "$#" = 1 ]; then + ${config.systemSettings.dotfilesDir}/scripts/sync.sh; + exit 0; + fi + elif [ "$1" = "refresh" ]; then + if [ "$#" -gt 1 ]; then + echo "Warning: The 'refresh' command has no subcommands (no $2 subcommand)"; + fi + ${config.systemSettings.dotfilesDir}/scripts/sync-posthook.sh; + exit 0; + elif [ "$1" = "update" ]; then + ${config.systemSettings.dotfilesDir}/scripts/update.sh "''${@:2}"; + exit 0; + elif [ "$1" = "upgrade" ]; then + if [ "$#" -gt 1 ]; then + echo "Warning: The 'upgrade' command has no subcommands (no $2 subcommand)"; + fi + ${config.systemSettings.dotfilesDir}/scripts/upgrade.sh; + exit 0; + elif [ "$1" = "pull" ]; then + if [ "$#" -gt 1 ]; then + echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)"; + fi + ${config.systemSettings.dotfilesDir}/scripts/pull.sh; + exit 0; + elif [ "$1" = "build" ]; then + if [ "$#" -gt 1 ]; then + echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)"; + fi + ${config.systemSettings.dotfilesDir}/scripts/build.sh; + exit 0; + elif [ "$1" = "harden" ]; then + if [ "$#" -gt 1 ]; then + echo "Warning: The 'harden' command has no subcommands (no $2 subcommand)"; + fi + ${config.systemSettings.dotfilesDir}/scripts/harden.sh; + exit 0; + elif [ "$1" = "soften" ]; then + if [ "$#" -gt 1 ]; then + echo "Warning: The 'soften' command has no subcommands (no $2 subcommand)"; + fi + ${config.systemSettings.dotfilesDir}/scripts/soften.sh; + exit 0; + elif [ "$1" = "gc" ]; then + if [ "$#" -gt 2 ]; then + echo "Warning: The 'gc' command only accepts one argument (collect_older_than)"; + fi + if [ "$2" = "full" ]; then + sudo nix-collect-garbage --delete-old; + nix-collect-garbage --delete-old; + elif [ "$2" ]; then + sudo nix-collect-garbage --delete-older-than $2; + nix-collect-garbage --delete-older-than $2; + else + sudo nix-collect-garbage --delete-older-than 30d; + nix-collect-garbage --delete-older-than 30d; + fi + fi + '') + ]; + }; } diff --git a/modules/user/browser/default.nix b/modules/user/browser/default.nix index 53913e4c..b890b497 100644 --- a/modules/user/browser/default.nix +++ b/modules/user/browser/default.nix @@ -24,7 +24,7 @@ in { userSettings.spawnBrowser = lib.mkMerge [ (lib.mkIf ((browser == "brave") || (browser == "librewolf")) browser) (lib.mkIf (!(config.userSettings.hyprland.hyprprofiles.enable) && (browser == "qutebrowser")) "qutebrowser --qt-flag ignore-gpu-blacklist --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag enable-accelerated-2d-canvas --qt-flag num-raster-threads=4") - (lib.mkIf config.userSettings.hyprland.hyprprofiles.enable "qutebrowser-hyprprofile") + (lib.mkIf (config.userSettings.hyprland.hyprprofiles.enable && (browser == "qutebrowser")) "qutebrowser-hyprprofile") (lib.mkIf (browser == null) "") ]; }; diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix index 47d0b187..77be98c5 100644 --- a/modules/user/hyprland/default.nix +++ b/modules/user/hyprland/default.nix @@ -13,7 +13,7 @@ in }; }; - config = { + config = lib.mkIf cfg.enable { userSettings.alacritty.enable = true; userSettings.kitty.enable = true; userSettings.japanese.enable = true; diff --git a/modules/user/plasma/default.nix b/modules/user/plasma/default.nix index 3bd527c8..401d9f6c 100644 --- a/modules/user/plasma/default.nix +++ b/modules/user/plasma/default.nix @@ -1,4 +1,4 @@ -{config, lib, pkgs, ...}: +{config, lib, pkgs, inputs, ...}: let cfg = config.userSettings.plasma; in { @@ -8,6 +8,8 @@ in { }; }; + imports = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; + config = lib.mkIf cfg.enable { programs.plasma = { enable = true; diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 00000000..721bb4cf --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# Script to build all systems +# And push to attic cache + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + + +pushd $SCRIPT_DIR/.. &> /dev/null; +nixos-rebuild build --flake .#snowfire; +attic push emmet ./result; +rm ./result; +nixos-rebuild build --flake .#polarias; +attic push emmet ./result; +rm ./result; +nixos-rebuild build --flake .#zenith; +attic push emmet ./result; +rm ./result; +nixos-rebuild build --flake .#stardust; +attic push emmet ./result; +rm ./result; +nixos-rebuild build --flake .#ori; +attic push emmet ./result; +rm ./result; diff --git a/scripts/install.sh b/scripts/install.sh index 16f0afdb..6b18b53d 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,5 +1,8 @@ #!/bin/sh +## THIS DOESN'T WORK ANYMORE BTW + +# TODO update this.. # Automated script to install my dotfiles # Clone dotfiles diff --git a/scripts/sync-system.sh b/scripts/sync-system.sh deleted file mode 100755 index 050ae2cd..00000000 --- a/scripts/sync-system.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Script to synchronize system state -# with configuration files for nixos system -# and home-manager - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -# Rebuild system -sudo nixos-rebuild switch --flake $SCRIPT_DIR/..#system; diff --git a/scripts/sync-user.sh b/scripts/sync-user.sh deleted file mode 100755 index c9d3372f..00000000 --- a/scripts/sync-user.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Script to synchronize system state -# with configuration files for nixos system -# and home-manager - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -# Install and build home-manager configuration -home-manager switch --flake $SCRIPT_DIR/..#user -b bkp; - -$SCRIPT_DIR/sync-posthook.sh diff --git a/scripts/sync.sh b/scripts/sync.sh index 73977ec3..b8e8ac53 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -6,5 +6,8 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -$SCRIPT_DIR/sync-system.sh -$SCRIPT_DIR/sync-user.sh +# Rebuild system +sudo nixos-rebuild switch --flake $SCRIPT_DIR/..; + +# Refresh +$SCRIPT_DIR/sync-posthook.sh diff --git a/scripts/update.sh b/scripts/update.sh index e8804860..ad2529dd 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -4,8 +4,12 @@ # synchronizing configuration SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +OUTOFDATEFLAKEREFS=(hyprland/hyprcursor) # Update flake pushd $SCRIPT_DIR/.. &> /dev/null; sudo nix flake update "$@"; +if [ "$#" -eq 0 ]; then + sudo nix flake update $OUTOFDATEFLAKEREFS; +fi popd &> /dev/null;