diff --git a/flake.lock b/flake.lock index 9559052..9972587 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1669146234, - "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=", + "lastModified": 1669650994, + "narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d", + "rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46", "type": "github" }, "original": { @@ -114,16 +114,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669625751, - "narHash": "sha256-KIT7X/L0h0e5gbvvU3rPsrWsftei6i8obXPlvBYAy1A=", + "lastModified": 1669890542, + "narHash": "sha256-UBCbVML/M1skNZOQpokePtkgNs1K+5tZpawYTCoJVJU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc7ae74d400f29260eab2f48f1f44a10914d0f9c", + "rev": "ebd5e9b80da4b0da94ba87f93d2ed12dc1fac89c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } @@ -198,11 +198,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1669152228, - "narHash": "sha256-FEDReoTLWJHXcNso7aaAlAUU7uOqIR6Hc/C/nqlfooE=", + "lastModified": 1669829516, + "narHash": "sha256-laWMD/TZzyrulu8xLNoSPertXOxjRD7BrcAVwKl+NyQ=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "078b0dee35e2da01334af682ec347463b70a9986", + "rev": "471c7f1ecace25e39099206431300322632d25c4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f278248..6572635 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Thor system configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-22.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-22.11"; nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { diff --git a/hm_modules/dunst.nix b/hm_modules/dunst.nix index 4638283..67fa40c 100644 --- a/hm_modules/dunst.nix +++ b/hm_modules/dunst.nix @@ -5,7 +5,6 @@ in home.packages = with pkgs; [ dunst rice.font.normal.package ]; services.dunst = { enable = true; - # package = pkgs.unstable.dunst; iconTheme = { package = pkgs.qogir-icon-theme; name = "Qogir-dark"; diff --git a/hm_modules/kitty.nix b/hm_modules/kitty.nix index ebe7f84..ccb1e3f 100644 --- a/hm_modules/kitty.nix +++ b/hm_modules/kitty.nix @@ -25,7 +25,6 @@ in { programs.kitty = { enable = true; - package = pkgs.unstable.kitty; settings = { scrollback_lines = 10000; enable_audio_bell = false; diff --git a/hm_modules/kubernetes-admin.nix b/hm_modules/kubernetes-admin.nix index 68db860..d7e41e9 100644 --- a/hm_modules/kubernetes-admin.nix +++ b/hm_modules/kubernetes-admin.nix @@ -2,6 +2,6 @@ home.packages = with pkgs; [ kubectl kubernetes-helm - unstable.lens + lens ]; } diff --git a/hm_modules/onedrive.nix b/hm_modules/onedrive.nix index 11d6113..3d4fc54 100644 --- a/hm_modules/onedrive.nix +++ b/hm_modules/onedrive.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -let onedriveCmd = "${pkgs.unstable.onedrive}/bin/onedrive --monitor"; +let onedriveCmd = "${pkgs.onedrive}/bin/onedrive --monitor"; in { systemd.user.services."onedrive" = { Unit = { diff --git a/hm_modules/rofi.nix b/hm_modules/rofi.nix index 63265db..4919ab1 100644 --- a/hm_modules/rofi.nix +++ b/hm_modules/rofi.nix @@ -11,7 +11,6 @@ enable = true; location = "center"; font = "${pkgs.rice.font.monospace.name} ${toString pkgs.rice.font.monospace.size}"; - # package = pkgs.unstable.rofi; plugins = with pkgs.unstable;[ rofi-calc ]; diff --git a/hm_modules/sxhkd.nix b/hm_modules/sxhkd.nix index 969f1b6..c2d4247 100644 --- a/hm_modules/sxhkd.nix +++ b/hm_modules/sxhkd.nix @@ -10,8 +10,7 @@ pamixer playerctl terminator - unstable.bsp-layout - unstable.kitty + bsp-layout update-background xorg.xbacklight clipedit diff --git a/loki/configuration.nix b/loki/configuration.nix index f037146..b705cf9 100644 --- a/loki/configuration.nix +++ b/loki/configuration.nix @@ -100,7 +100,7 @@ with lib; { gnome.gnome-keyring.enable = true; gvfs = { enable = true; package = mkForce pkgs.gnome3.gvfs; }; jackett = { enable = true; openFirewall = true; group = "users"; }; - jellyfin = { enable = true; package = pkgs.unstable.jellyfin; openFirewall = true; group = "users"; }; + jellyfin = { enable = true; package = pkgs.jellyfin; openFirewall = true; group = "users"; }; logind.lidSwitch = "ignore"; # node-red = { enable = true; openFirewall = true; withNpmAndGcc = true; }; openssh = { @@ -398,7 +398,6 @@ with lib; { services.home-assistant = { enable = true; - # package = pkgs.unstable.home-assistant; # openFirewall = true; # config = { # default_config = { }; diff --git a/nixos_modules/zerotier.nix b/nixos_modules/zerotier.nix index a70c135..bce1b17 100644 --- a/nixos_modules/zerotier.nix +++ b/nixos_modules/zerotier.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { services.zerotierone = { enable = true; - package = pkgs.unstable.zerotierone; + package = pkgs.zerotierone; joinNetworks = [ "8056c2e21cf9c753" ]; }; } diff --git a/odin/hm.nix b/odin/hm.nix index 13f7513..3fb8208 100644 --- a/odin/hm.nix +++ b/odin/hm.nix @@ -74,11 +74,11 @@ teams tex2nix transmission-gtk - unstable.authy - unstable.discord - unstable.obsidian - unstable.tdesktop - unstable.thunderbird + authy + discord + obsidian + tdesktop + thunderbird # unstable.zotero virt-manager virt-viewer diff --git a/thor/hm.nix b/thor/hm.nix index 1fceb0e..2baf32f 100644 --- a/thor/hm.nix +++ b/thor/hm.nix @@ -68,10 +68,10 @@ tdesktop teams transmission-gtk - unstable.authy - unstable.obsidian - unstable.spotify - unstable.thunderbird + authy + obsidian + spotify + thunderbird # unstable.zotero virt-manager virt-viewer