diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 78ab1354..8b6cfbcf 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -48,8 +48,8 @@ config = lib.mkIf config.features.full.enable { myModules.base.enable = true; myModules.desktop.enable = true; - myModules.plasma.enable = false; - myModules.gnome.enable = true; + myModules.plasma.enable = true; + myModules.gnome.enable = false; myModules.xmonad.enable = true; myModules.extra.enable = true; myModules.electron.enable = true; diff --git a/nixos/flake.lock b/nixos/flake.lock index 8a919231..0abe6243 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -29,7 +29,7 @@ "railbird-secrets", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1707830867, @@ -107,22 +107,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -138,7 +122,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -154,7 +138,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -296,24 +280,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -328,9 +294,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1685518550, @@ -346,9 +312,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1709126324, @@ -364,9 +330,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -382,9 +348,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1685518550, @@ -400,9 +366,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -466,27 +432,6 @@ "url": "https://hackage.haskell.org/package/fourmolu-0.12.0.0/fourmolu-0.12.0.0.tar.gz" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" - }, - "locked": { - "lastModified": 1735508351, - "narHash": "sha256-hrmauluOxnJlvc49WeclJdoz24Nb7c/WHhyLGkmpde8=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "b3925b83ae4b24b02a9b268e88dffcf1af25734b", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": [ @@ -779,8 +724,8 @@ }, "haskell-language-server": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", "fourmolu-011": "fourmolu-011", "fourmolu-012": "fourmolu-012", "gitignore": "gitignore", @@ -814,8 +759,8 @@ }, "haskell-language-server_2": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_7", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_6", "fourmolu-011": "fourmolu-011_2", "fourmolu-012": "fourmolu-012_2", "gitignore": "gitignore_2", @@ -1151,7 +1096,7 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", "libgit2": "libgit2", @@ -1210,8 +1155,8 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_4" }, "locked": { @@ -1294,38 +1239,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_10": { "locked": { "lastModified": 1686874404, @@ -1599,7 +1512,7 @@ "railbird-secrets": { "inputs": { "agenix": "agenix_2", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_9" }, "locked": { @@ -1620,7 +1533,6 @@ "inputs": { "agenix": "agenix", "flake-utils": "flake-utils", - "ghostty": "ghostty", "git-ignore-nix": "git-ignore-nix", "gtk-sni-tray": "gtk-sni-tray", "gtk-strut": "gtk-strut", @@ -1635,10 +1547,10 @@ "notifications-tray-icon": "notifications-tray-icon", "railbird-secrets": "railbird-secrets", "status-notifier-item": "status-notifier-item", - "systems": "systems_7", + "systems": "systems_6", "taffybar": "taffybar", "vscode-server": "vscode-server", - "xmonad": "xmonad", + "xmonad": "xmonad_2", "xmonad-contrib": "xmonad-contrib" } }, @@ -1736,21 +1648,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1873,7 +1770,7 @@ }, "taffybar": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "git-ignore-nix": "git-ignore-nix_2", "gtk-sni-tray": "gtk-sni-tray_2", "gtk-strut": "gtk-strut_2", @@ -1882,9 +1779,7 @@ "nixpkgs" ], "status-notifier-item": "status-notifier-item_2", - "xmonad": [ - "xmonad" - ] + "xmonad": "xmonad" }, "locked": { "lastModified": 1714656757, @@ -1902,6 +1797,22 @@ } }, "unstable": { + "locked": { + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "unstable_2": { "locked": { "lastModified": 1735291276, "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", @@ -1919,7 +1830,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_11" }, "locked": { @@ -1939,26 +1850,30 @@ "xmonad": { "inputs": { "flake-utils": [ + "taffybar", "flake-utils" ], "git-ignore-nix": [ + "taffybar", "git-ignore-nix" ], "nixpkgs": [ + "taffybar", "nixpkgs" ], "unstable": "unstable" }, "locked": { - "lastModified": 1731735867, - "narHash": "sha256-eaC4wCtkpj/jvpc0X+7B/DI7p479lQEq1aPcf52V4EY=", + "lastModified": 1714229485, + "narHash": "sha256-AOy87dJL0T9wSe1kM0tTzFlV++JwmoGW4BfBXzIUbsI=", "owner": "xmonad", "repo": "xmonad", - "rev": "81cf71d7c6807fba14c1000aa40bfee84f7fa0e1", + "rev": "cde1a25bca9b7aeeb24af73588221f5f54ae770b", "type": "github" }, "original": { "owner": "xmonad", + "ref": "master", "repo": "xmonad", "type": "github" } @@ -1993,28 +1908,30 @@ "type": "github" } }, - "zig": { + "xmonad_2": { "inputs": { - "flake-compat": [ - "ghostty" + "flake-utils": [ + "flake-utils" + ], + "git-ignore-nix": [ + "git-ignore-nix" ], - "flake-utils": "flake-utils_2", "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] + "nixpkgs" + ], + "unstable": "unstable_2" }, "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "lastModified": 1731735867, + "narHash": "sha256-eaC4wCtkpj/jvpc0X+7B/DI7p479lQEq1aPcf52V4EY=", + "owner": "xmonad", + "repo": "xmonad", + "rev": "81cf71d7c6807fba14c1000aa40bfee84f7fa0e1", "type": "github" }, "original": { - "owner": "mitchellh", - "repo": "zig-overlay", + "owner": "xmonad", + "repo": "xmonad", "type": "github" } } diff --git a/nixos/flake.nix b/nixos/flake.nix index 0333a9c4..191cb6b7 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -55,7 +55,6 @@ url = "github:taffybar/taffybar/old-master"; inputs = { nixpkgs.follows = "nixpkgs"; - xmonad.follows = "xmonad"; }; };