diff --git a/flake.lock b/flake.lock index e78949a..ef3334f 100644 --- a/flake.lock +++ b/flake.lock @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1757808926, - "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1757430124, - "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", + "lastModified": 1758805352, + "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", + "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", "type": "github" }, "original": { @@ -204,11 +204,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757891025, - "narHash": "sha256-NfiTk59huy/YK9H4W4wVwRYyiP2u86QqROM5KK4f5F4=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4c38a024fa32e61db2be8573e5282b15d9733a79", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -264,6 +264,20 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "revCount": 866707, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.866707%2Brev-e643668fd71b949c53f8626614b21ff71a07379d/0199817d-7e74-7254-9801-5432e45096c7/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1757034884, @@ -280,12 +294,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", - "revCount": 809873, + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "revCount": 810395, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.809873%2Brev-9a094440e02a699be5c57453a092a8baf569bdad/019948d8-e1ce-71d3-a6ab-b8e7de3004e2/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.810395%2Brev-25e53aa156d47bad5082ff7618f5feb1f5e02d01/01998694-ad17-7fa8-8c3a-c8bc31d19657/source.tar.gz" }, "original": { "type": "tarball", @@ -300,6 +314,7 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", + "nixpkgs-unstable": "nixpkgs-unstable", "systems": "systems" } }, diff --git a/flake.nix b/flake.nix index d6c0375..0d1133c 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ # Nixpkgs determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0"; + nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1"; # Flatpak nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main"; # Home manager @@ -13,6 +14,7 @@ url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + # Theme for niri # Macos nix-darwin = { url = "github:LnL7/nix-darwin"; @@ -22,6 +24,7 @@ outputs = { self + , nixpkgs-unstable , determinate , nixos-hardware , nixpkgs @@ -75,7 +78,11 @@ nix-flatpak ; specialArgs = { - inputs = { }; + inputs = + { + inherit + nixpkgs-unstable; + }; }; }; # Libs @@ -142,14 +149,6 @@ # localNixCaches = localNixCaches; localDockerRegistries = localDockerRegistries; homeManagerVersion = homeManagerVersion; - desktop = { - enable = true; - user = user; - enableKDE = true; - enableHypr = false; - enableX11 = true; - enableWine = true; - }; os = { enable = true; firewall = { enable = false; }; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 6f71bda..3fa49e3 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -78,6 +78,15 @@ in ''; services.blueman-applet.enable = true; }; + # Network + # networking.nameservers = [ "9.9.9.9" "1.1.1.1" ]; + + # services.resolved = { + # enable = true; + # dnssec = "true"; + # fallbackDns = [ "9.9.9.9" "1.1.1.1" ]; + # dnsovertls = "true"; + # }; # Sunshine services.sunshine = { enable = false; diff --git a/modules/lib.nix b/modules/lib.nix index e91a9c7..426c63d 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -33,7 +33,7 @@ let specialArgs = specialArgs // { inherit system skygUtils; }; - system = system; + inherit system; modules = [ determinate.nixosModules.default ] ++ (makeImports { diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix index b602ec0..8024be1 100644 --- a/modules/nixos/desktop/tiler/niri.nix +++ b/modules/nixos/desktop/tiler/niri.nix @@ -1,6 +1,10 @@ -{ config, lib, pkgs, skygUtils, ... }: +{ config, lib, pkgs, skygUtils, system, nixpkgs-unstable, ... }: let cfg = config.skyg.nixos.desktop.tiler.niri; + # unstable = import nixpkgs-unstable { + # inherit system; + # config.allowUnfree = true; + # }; in { options = { @@ -20,6 +24,7 @@ in xwayland-satellite adwaita-icon-theme papirus-icon-theme + # unstable.niriswitcher ]; system.userActivationScripts.niriConfig.text = skygUtils.makeHyperlinkScriptToConfigs { filePath = "niri";