From a2a3e9e1ad0ae9f7d3b204c2b1a6753d5524e13b Mon Sep 17 00:00:00 2001 From: Madeline Hashcube Date: Sun, 22 Mar 2026 17:25:27 -0500 Subject: [PATCH] ok so it don't build, but i think it's fine for now --- flake.lock | 40 +++++++++++++--------------------------- flake.nix | 8 +++++++- modules/display/kde.nix | 5 +++++ modules/display/sddm.nix | 5 +++-- modules/iolite.nix | 1 - modules/jovian.nix | 1 + 6 files changed, 29 insertions(+), 31 deletions(-) create mode 100644 modules/display/kde.nix diff --git a/flake.lock b/flake.lock index d7d6cb6..89bb1c0 100644 --- a/flake.lock +++ b/flake.lock @@ -236,7 +236,9 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1770366813, @@ -256,7 +258,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -400,22 +402,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1717786204, "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", @@ -431,7 +417,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -447,7 +433,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1769461804, "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", @@ -560,11 +546,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -614,7 +600,7 @@ }, "nook-desktop": { "inputs": { - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "nixpkgs-stable": "nixpkgs-stable_2", "systems": "systems_5" }, @@ -643,7 +629,7 @@ "home-manager": "home-manager_2", "jovian": "jovian", "niri": "niri", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nixvim": "nixvim", "nook-desktop": "nook-desktop", "walker": "walker", @@ -745,7 +731,7 @@ "elephant": [ "elephant" ], - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "systems": "systems_6" }, "locked": { @@ -798,7 +784,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1770568363, diff --git a/flake.nix b/flake.nix index afc110d..796e52e 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,10 @@ url = "github:abenz1267/walker"; inputs.elephant.follows = "elephant"; }; - jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; + jovian = { + url = "github:Jovian-Experiments/Jovian-NixOS"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -37,6 +40,7 @@ copyparty, beeper, walker, + jovian, ... }@inputs:{ nixosConfigurations = { @@ -100,6 +104,8 @@ modules = [ catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager + niri.nixosModules.niri + jovian.nixosModules.default ./configurations/hosts/iolite/configuration.nix diff --git a/modules/display/kde.nix b/modules/display/kde.nix new file mode 100644 index 0000000..d543256 --- /dev/null +++ b/modules/display/kde.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.desktopManager.plasma6.enable = true; +} diff --git a/modules/display/sddm.nix b/modules/display/sddm.nix index fddfa86..d0f6311 100644 --- a/modules/display/sddm.nix +++ b/modules/display/sddm.nix @@ -1,9 +1,10 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { services.displayManager.sddm = { + wayland.enable = true; enable = true; - package = pkgs.kdePackages.sddm; + package = lib.mkDefault pkgs.kdePackages.sddm; autoNumlock = true; }; } diff --git a/modules/iolite.nix b/modules/iolite.nix index 16745dd..216579c 100644 --- a/modules/iolite.nix +++ b/modules/iolite.nix @@ -7,7 +7,6 @@ ./programs/. ./display/sddm.nix - ./display/cinnamon.nix ./users/magames.nix diff --git a/modules/jovian.nix b/modules/jovian.nix index 4c8cb72..c350a5d 100644 --- a/modules/jovian.nix +++ b/modules/jovian.nix @@ -3,6 +3,7 @@ { imports = [ ./programs/steam.nix + ./display/kde.nix ]; jovian = { decky-loader = { -- 2.51.2