diff --git a/flake.lock b/flake.lock index 55872fd..7b3064c 100644 --- a/flake.lock +++ b/flake.lock @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1738428726, - "narHash": "sha256-OUoEgorFHBVnqQ2lITqs6MGN7MH4t/8hLEO29OKu6CM=", + "lastModified": 1738178313, + "narHash": "sha256-/8TLf6LkXGRGERzcWMNDeXjYaHSbexmfV+ofheo7K6k=", "owner": "nix-community", "repo": "home-manager", - "rev": "dae6d3460c8bab3ac9f38a86affe45b32818e764", + "rev": "420a0d9506b5dac4d86a68b9ef8e763624ad86c6", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1738341980, - "narHash": "sha256-xOpkKwNkpbK6lL/V48xIsONnk8PBzbf7D98EqqGpGGs=", + "lastModified": 1738174211, + "narHash": "sha256-eYmp1mKM4kULV1W+EBtCPk6LmKWl2REivaYfGRl+AWo=", "ref": "refs/heads/main", - "rev": "083c6de22cb306b0f1f7bd8e062ecdd72133e4e2", - "revCount": 17337, + "rev": "64e33a7e09a0d1faacf2fd3f6ebd647fe4d8346a", + "revCount": 17329, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738410471, - "narHash": "sha256-j0XZIViI4ZEFwhrEzVKz696/4DZ9pRiWtGfxJogA+MM=", + "lastModified": 1738156024, + "narHash": "sha256-D3cox2cbtFauXz1skDTkJwSU0272wY6wRwiFNm5TV/c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "16f8e14385163479aca7231d8fab0091adac2e56", + "rev": "541920ede8b5d48f110c94d858a1ddf283eac3b9", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738404307, - "narHash": "sha256-BFtfL5kZbIsDAMgbVP5E0HbqDapYWw4NBw1xS0AOCCc=", + "lastModified": 1738148186, + "narHash": "sha256-Yd2xKbZ8S4LC5sxPleuutlX0RbKnI93LhciVhneNBHQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "32ad545f842f4c176548e30d183d10e0a2bab752", + "rev": "1d3820a064f1f3b686eb6e8a1aab155681a96457", "type": "github" }, "original": { @@ -832,11 +832,11 @@ ] }, "locked": { - "lastModified": 1738277753, - "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", + "lastModified": 1738033138, + "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", + "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738396600, - "narHash": "sha256-fWpw3MUUidq+GzuQdgpZwk4Vh4MF6MN2HEyyT2PguGI=", + "lastModified": 1738178544, + "narHash": "sha256-UbM+zJFlze877N5j2YMLKYFX7t05VvmuNX2M0vJ7RfI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6eec6bbb933a6dad6cf6afe3d51329f31d22e974", + "rev": "975ac0ab33ee7fea64842047a96f5d679d90913c", "type": "github" }, "original": { @@ -1102,11 +1102,11 @@ ] }, "locked": { - "lastModified": 1738428106, - "narHash": "sha256-HpuE7jQnyOXJStEoP2AAsOTTqsdudn6xV1o+EbV8ssc=", + "lastModified": 1738184667, + "narHash": "sha256-+pG3UJVAdVCF3nGRpy5n/tbCzGa64DCWOC8hAxnssD0=", "owner": "nix-community", "repo": "nixvim", - "rev": "8f8f50243ea803304b1bd04aa56bd736fe2c28eb", + "rev": "2f5374c3dcd06c750c36798bce6bccdf8a25bc89", "type": "github" }, "original": { @@ -1154,29 +1154,6 @@ "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": { "flake": false, "locked": { @@ -1255,7 +1232,6 @@ "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", - "plasma-manager": "plasma-manager", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "treefmt": "treefmt" @@ -1285,11 +1261,11 @@ ] }, "locked": { - "lastModified": 1738376888, - "narHash": "sha256-S6ErHxkSm0iA7ZMsjjDaASWxbELYcdfv8BhOkkj1rHw=", + "lastModified": 1738117527, + "narHash": "sha256-GFviGfaezjGLFUlxdv3zyC7rSZvTXqwcG/YsF6MDkOw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "83284068670d5ae4a43641c4afb150f3446be70d", + "rev": "6a3dc6ce4132bd57359214d986db376f2333c14d", "type": "github" }, "original": { @@ -1305,11 +1281,11 @@ ] }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1737411508, + "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cb60dbb..66dad85 100644 --- a/flake.nix +++ b/flake.nix @@ -72,11 +72,6 @@ url = "github:nix-community/nix-ld"; inputs.nixpkgs.follows = "nixpkgs"; }; - plasma-manager = { - url = "github:nix-community/plasma-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR @@ -223,7 +218,6 @@ ./home/yt/ytnix.nix inputs.nixvim.homeManagerModules.nixvim inputs.niri.homeModules.config - inputs.plasma-manager.homeManagerModules.plasma-manager ]; }; diff --git a/home/plasma.nix b/home/plasma.nix deleted file mode 100644 index 077b530..0000000 --- a/home/plasma.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ ... }: -{ - programs.plasma = { - enable = true; - workspace = { - lookAndFeel = "org.ide.breezedark.desktop"; - cursor = { - theme = "Bibata-Modern-Classic"; - size = 32; - }; - }; - - fonts = { - general = { - family = "IBM Plex Mono"; - pointSize = 12; - }; - }; - - input.keyboard = { - numlockOnStartup = "on"; - options = [ "ctrl:nocaps" ]; - }; - }; -} diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 4a8b31e..0e43354 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -11,7 +11,6 @@ ../irssi.nix ../kitty.nix ../vscode.nix - ../plasma.nix ]; home = { username = "yt"; @@ -115,7 +114,6 @@ lldb (cutter.withPlugins (plugins: with plugins; [ rz-ghidra jsdec sigdb ])) ida-free - patchelf ]; programs.waybar.enable = true; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index e0d7c1d..b748be0 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -174,8 +174,6 @@ haskell-language-server ghc sbctl # secure boot - wine-wayland - wine64 ]; environment.sessionVariables = { @@ -189,12 +187,6 @@ services.displayManager = { enable = true; autoLogin.user = "yt"; - defaultSession = "plasma"; - sddm = { - enable = true; - wayland.enable = true; - autoNumlock = true; - }; }; fonts.packages = with pkgs; [ @@ -302,8 +294,6 @@ waylandpp cairo xcb-util-cursor - libplist - p11-kit xorg.libX11 xorg.libxcb xorg.xcbutilwm @@ -387,9 +377,4 @@ startAgent = true; enableAskPassword = true; }; - - services.desktopManager.plasma6 = { - enable = true; - enableQt5Integration = true; - }; }