diff --git a/flake.lock b/flake.lock index ba8e2f3..580463a 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736455421, - "narHash": "sha256-TsDbQIHOi84hTjb0SSLSyX27P1MA1DVLagX8uik+WGk=", + "lastModified": 1737085478, + "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "6ef757a8f85db7a124d370378850339a899c9e65", + "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1736370755, - "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", + "lastModified": 1737162735, + "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", + "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08", "type": "github" }, "original": { @@ -114,11 +114,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1736334301, - "narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=", + "lastModified": 1736952876, + "narHash": "sha256-dJXuLP2CBkIG333L+Rb3e1D0oXHYbl0MgmKPGuvFuAI=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "5f4ec93d432cd5288f6fe20d8842dceb5a065885", + "rev": "b6966d5fa96b0fae99a4da0b5bdfbb0a75f5c058", "type": "github" }, "original": { @@ -131,19 +131,15 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": [ - "unstable" - ], - "nixpkgs-stable": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1736513564, - "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=", + "lastModified": 1737176185, + "narHash": "sha256-TFqr2LJ6gVWAhuIXbN5T2s+hHCQlgVpJY3VPV6XKiDk=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "0855bf33427209e4f5e3d2d0968a14784525e929", + "rev": "3d104e57bd1e6374830ee55d377e15d835d84963", "type": "github" }, "original": { @@ -154,11 +150,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1736978406, + "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "b678606690027913f3434dea3864e712b862dde5", "type": "github" }, "original": { @@ -170,16 +166,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -200,6 +196,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1736916166, + "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1733229606, @@ -216,6 +228,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1736916166, + "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "ghostty": "ghostty", @@ -224,10 +252,8 @@ "nix-flatpak": "nix-flatpak", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "systems": "systems_2", - "unstable": "unstable", - "unstable-home-manager": "unstable-home-manager" + "nixpkgs": "nixpkgs_2", + "systems": "systems_2" } }, "systems": { @@ -260,43 +286,6 @@ "type": "github" } }, - "unstable": { - "locked": { - "lastModified": 1736519262, - "narHash": "sha256-qnbii+cIEgxrQ0g3ayiSYVU3nmmRj8AOD9miY3fmx7k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3718eb9874c52f0fd82c2aac2a27fc012fa5f858", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "unstable-home-manager": { - "inputs": { - "nixpkgs": [ - "unstable" - ] - }, - "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, "zig": { "inputs": { "flake-compat": [ diff --git a/flake.nix b/flake.nix index f20936c..cd791bd 100644 --- a/flake.nix +++ b/flake.nix @@ -4,14 +4,9 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; systems.url = "github:nix-systems/default"; # Nixpkgs - unstable.url = "github:NixOS/nixpkgs/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; # Cosmic - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - inputs.nixpkgs.follows = "unstable"; - }; + nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; # Terminal ghostty = { url = "github:ghostty-org/ghostty"; @@ -23,10 +18,6 @@ url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - unstable-home-manager = { - url = "github:nix-community/home-manager/master"; - inputs.nixpkgs.follows = "unstable"; - }; # Macos nix-darwin = { url = "github:LnL7/nix-darwin"; @@ -39,9 +30,7 @@ , nixos-hardware , nixpkgs , systems - , unstable , home-manager - , unstable-home-manager , nix-darwin , nixos-cosmic , nix-flatpak @@ -93,8 +82,7 @@ specialArgs = { inputs = { inherit - ghostty - unstable; + ghostty; }; }; }; @@ -103,10 +91,6 @@ nixpkgs = nixpkgs; home-manager = home-manager; } // libConfig)); - unstableLib = (import modules/lib.nix ({ - nixpkgs = unstable; - home-manager = unstable-home-manager; - } // libConfig)); homelabServices = ( (lib.makeHLServices { user = user; @@ -191,7 +175,6 @@ nixos-hardware.nixosModules.framework-13-7040-amd (import ./hosts/fwbook.nix { user = user; - unstable = unstableLib.pkgs.x86_64-linux; }) ]; }; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 91ed629..27703de 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -1,4 +1,4 @@ -{ user, unstable }: +{ user }: { pkgs, ... }: let zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook; @@ -18,13 +18,14 @@ in nixos = { common.hardware = { sound.enable = true; + pipewire.enable = true; laptop-power-mgr.enable = true; amdgpu.enable = true; }; desktop = { enable = true; - kde.enable = true; - cosmic.enable = false; + cosmic.enable = true; + # kde.enable = true; crypto.enable = true; }; }; @@ -36,7 +37,16 @@ in ]; }; }; - services.displayManager.defaultSession = "plasmax11"; + # services.displayManager.sddm.enable = true; + # services.displayManager.sddm.wayland.enable = true; + # services.displayManager.sddm.wayland.compositor = "kwin"; + + # services.xserver.displayManager.gdm.enable = false; + # services.xserver.displayManager.gdm.autoSuspend = false; + # services.xserver.displayManager.gdm.banner = ''Ari's PC''; + # services.xserver.displayManager.gdm.wayland = false; + + # services.displayManager.defaultSession = "plasmax11"; # Firmware updater services.fwupd.enable = true; services.fwupd.package = (import @@ -92,7 +102,6 @@ in host = "0.0.0.0"; port = 11434; acceleration = "rocm"; - package = unstable.ollama; rocmOverrideGfx = "11.0.2"; }; # # Brother Printer diff --git a/modules/nixos/common/core.nix b/modules/nixos/common/core.nix index 8ffcef0..a840ad0 100644 --- a/modules/nixos/common/core.nix +++ b/modules/nixos/common/core.nix @@ -1,6 +1,7 @@ { pkgs, config, ... }: { # System Packages + services.dbus.enable = true; services.hydra.useSubstitutes = true; programs.dconf.enable = true; programs.nix-ld.enable = true; diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix index 2f4e699..0be0496 100644 --- a/modules/nixos/desktop/cosmic.nix +++ b/modules/nixos/desktop/cosmic.nix @@ -14,6 +14,6 @@ in pkgs.cosmic-icons ]; services.desktopManager.cosmic.enable = true; - # services.displayManager.cosmic-greeter.enable = true; + services.displayManager.cosmic-greeter.enable = true; }; } diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 1f827d1..2a4697b 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -4,8 +4,8 @@ let in { imports = [ - ./kde.nix ./cosmic.nix + ./kde.nix ./wayland.nix ./x11.nix ./packages.nix @@ -20,15 +20,6 @@ in }; config = lib.mkIf cfg.desktop.enable { services.displayManager.enable = true; - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; - services.displayManager.sddm.wayland.compositor = "kwin"; - # security.pam.services..kwallet.enable = true; - - services.xserver.displayManager.gdm.enable = false; - services.xserver.displayManager.gdm.autoSuspend = false; - services.xserver.displayManager.gdm.banner = ''Ari's PC''; - services.xserver.displayManager.gdm.wayland = false; xdg = { autostart.enable = true; mime.enable = true; diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index d42a576..fd5c54f 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -23,6 +23,10 @@ in kdePackages.plasma-browser-integration kdePackages.xdg-desktop-portal-kde konsave # save configs + # kdePackages.kwayland + # kdePackages.kwayland-integration + libsForQt5.kwayland + libsForQt5.kwayland-integration ]; services.desktopManager.plasma6.notoPackage = pkgs.fira-code; }; diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix index 6d6d91d..cbc0de2 100644 --- a/modules/nixos/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -3,16 +3,26 @@ let cfg = config.skyg.nixos.desktop; in { - config = lib.mkIf cfg.enable { - # Flatpak - environment.systemPackages = with pkgs; [ - wayland - wayland-protocols - wayland-utils - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - ]; - programs.xwayland.enable = true; - xdg.portal.enable = true; - }; + config = lib.mkIf cfg.enable + { + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + environment.systemPackages = with pkgs; [ + wayland + wayland-protocols + wayland-utils + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + ]; + programs.xwayland.enable = true; + xdg.portal = { + enable = true; + xdgOpenUsePortal = true; + extraPortals = with pkgs;[ + xdg-desktop-portal-gtk + xdg-desktop-portal-wlr + xdg-desktop-portal + kdePackages.kwallet + ]; + }; + }; }