diff --git a/flake.lock b/flake.lock index 419e5e5..ad8b63e 100755 --- a/flake.lock +++ b/flake.lock @@ -1,15 +1,47 @@ { "nodes": { + "flake-compat": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1775320414, - "narHash": "sha256-pIDPHus8udcxO4lT+zUULBfvue2D08E73abzVEJNE+8=", + "lastModified": 1777733408, + "narHash": "sha256-lyKV2GtkMPS1Mp8bKJ8sBr7LPCzL4GnVnQQYa4e7UsQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5ee3b3ef63e469c84639c2c9e282726352c86069", + "rev": "9ce9f7f128c5834bb71a4f5c62232187371379b6", "type": "github" }, "original": { @@ -58,13 +90,53 @@ "type": "github" } }, + "ndg": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", + "owner": "feel-co", + "repo": "ndg", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", + "type": "github" + }, + "original": { + "owner": "feel-co", + "ref": "v2.6.0", + "repo": "ndg", + "type": "github" + } + }, + "nix-mineral": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "ndg": "ndg", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1777081271, + "narHash": "sha256-B866/yUI7+DDxP5/cSDDpsxzHKTiqm1dwDtzFTkSZjk=", + "owner": "cynicsketch", + "repo": "nix-mineral", + "rev": "3402bbd48291c3636371ac580d6509d2e68d1dee", + "type": "github" + }, + "original": { + "owner": "cynicsketch", + "repo": "nix-mineral", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1775203647, - "narHash": "sha256-6MWaMLXK9QMndI94CIxeiPafi3wuO+imCtK9tfhsZdw=", + "lastModified": 1776983936, + "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "80afbd13eea0b7c4ac188de949e1711b31c2b5f0", + "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", "type": "github" }, "original": { @@ -76,11 +148,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -90,6 +162,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1753579242, + "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1768564909, @@ -108,11 +195,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -124,11 +211,43 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-NZE+83qbc/hauTJs/uyv8Sf+1aFLP/LsHdIN6q6GQAc=", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "lastModified": 1755593991, + "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1776877367, + "narHash": "sha256-wMN1gM00sUQ2KC9CNr/XEOGdfOrl67PabIRv9AYayTo=", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre969196.46db2e09e1d3/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre985613.0726a0ecb6d4/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -139,22 +258,23 @@ "inputs": { "home-manager": "home-manager", "impermanence": "impermanence", + "nix-mineral": "nix-mineral", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "spicetify-nix": "spicetify-nix" } }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "systems": "systems" }, "locked": { - "lastModified": 1774790928, - "narHash": "sha256-/JO77td8AOH45kg9IJl2DXDwbhn+cyQxYbCMu4Ae1CA=", + "lastModified": 1777183994, + "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "2bfdf55faf76fed12950b17d4af501e5a463607f", + "rev": "501256c3e670ca1679501ce3839ea805df00d8ba", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 02fcda0..d28386a 100755 --- a/flake.nix +++ b/flake.nix @@ -7,13 +7,14 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager.url = "github:nix-community/home-manager"; spicetify-nix.url = "github:Gerg-L/spicetify-nix"; + nix-mineral.url = "github:cynicsketch/nix-mineral/"; }; - outputs = { self, nixpkgs, impermanence, nixos-hardware, home-manager, spicetify-nix, ... }: + outputs = { self, nixpkgs, impermanence, nixos-hardware, home-manager, spicetify-nix, nix-mineral, ... }: let mkHost = system: modules: nixpkgs.lib.nixosSystem { inherit system modules; - specialArgs = { inherit impermanence nixos-hardware spicetify-nix; }; + specialArgs = { inherit impermanence nixos-hardware spicetify-nix nix-mineral; }; }; mkPiImage = modules: (nixpkgs.lib.nixosSystem { diff --git a/modules/common.nix b/modules/common.nix index 0e5f8f1..f5d1292 100755 --- a/modules/common.nix +++ b/modules/common.nix @@ -21,7 +21,7 @@ # auto upgrade from your public repo system.autoUpgrade = { - enable = true; + #enable = true; flake = "github:notquitek3t/nixconf"; }; @@ -32,6 +32,7 @@ # networking networking.networkmanager.enable = true; + services.tailscale.enable = true; # environment programs.zsh.enable = true; diff --git a/modules/desktop-common.nix b/modules/desktop-common.nix index b2dc4ad..6d8bf5c 100755 --- a/modules/desktop-common.nix +++ b/modules/desktop-common.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, spicetify-nix,... }: +{ pkgs, lib, spicetify-nix, ... }: let spicePkgs = spicetify-nix.legacyPackages.${pkgs.stdenv.system}; @@ -16,6 +16,20 @@ in boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + # Avahi + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + publish = { + addresses = true; + domain = true; + enable = true; + hinfo = true; + userServices = true; + workstation = true; + }; + }; # Self Maintenance services.btrfs.autoScrub = { @@ -26,7 +40,7 @@ in # Performance services.system76-scheduler.enable = true; - hardware.system76.power-daemon.enable = true; + #hardware.system76.power-daemon.enable = true; services.thermald.enable = true; services.power-profiles-daemon.enable = true; @@ -130,7 +144,7 @@ in # the tradeoff is increased power consumption. Defaults to # 'false'. FastConnectable = true; - ControllerMode = "bredr"; + ControllerMode = "both"; }; Policy = { # Enable all controllers when they are found. This includes @@ -211,6 +225,7 @@ in }; networking.firewall = { + enable = false; allowedTCPPortRanges = [ { from = 8000; to = 9000; } ]; @@ -244,6 +259,8 @@ in security.pam.services.k3t.kwallet.forceRun = true; users.users.k3t = { packages = with pkgs; [ + moonlight-qt + input-leap fcast-client fcast-receiver joplin-desktop @@ -282,7 +299,6 @@ in archive_tool joystick keymap - osmc-skin jellyfin visualization-projectm visualization-goom diff --git a/modules/pi-common.nix b/modules/pi-common.nix index 51e2257..4a41d41 100755 --- a/modules/pi-common.nix +++ b/modules/pi-common.nix @@ -2,11 +2,11 @@ boot.initrd.allowMissingModules = true; boot.supportedFilesystems.zfs = false; - boot.kernelPackages = pkgs.linuxPackages_rpi4; + #boot.kernelPackages = pkgs.linuxPackages_rpi4; fileSystems = { "/" = { device = "/dev/disk/by-label/NIXOS_SD"; fsType = "ext4"; }; }; - + boot.kernelParams = [ "snd_bcm2835.enable_hdmi=1" "snd_bcm2835.enable_headphones=1" ]; # Pi 4 specific hardware = { @@ -34,7 +34,7 @@ # auto upgrade on pis can reboot unattended system.autoUpgrade = { - operation = "boot"; + #operation = "boot"; allowReboot = true; rebootWindow = { lower = "02:00"; upper = "05:00"; }; };