diff --git a/flake.lock b/flake.lock index bfe69ea..b5ff140 100644 --- a/flake.lock +++ b/flake.lock @@ -22,16 +22,16 @@ ] }, "locked": { - "lastModified": 1651519540, - "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", + "lastModified": 1653937612, + "narHash": "sha256-HybwffYKOM3UwlY54ZVCZgX7o5xpp2KhbZyyOnvwFMo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", + "rev": "bda2c80b4c1a8d85c84c343a25ac7303fbc7999d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-21.11", + "ref": "release-22.05", "repo": "home-manager", "type": "github" } @@ -73,16 +73,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652544513, - "narHash": "sha256-lFmU0/qodaMd6e7niNfrmi9tGxTcvE2etnNoTAxl7ho=", + "lastModified": 1653979012, + "narHash": "sha256-Md1OeSa4WwrtsjJKanOyrNfo9WbRCgURk23iRhUI2LU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6879c4f633ef6adeaeb3964c03964f7c3acd7f42", + "rev": "9b5e34626fbb7c251bf2c994f0b4334ab21df631", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-21.11", + "ref": "release-22.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 7cfe91b..86fdac8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,11 @@ description = "Thor system configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-21.11"; + + nixpkgs.url = "github:NixOS/nixpkgs/release-22.05"; home-manager = { - url = "github:nix-community/home-manager/release-21.11"; + url = "github:nix-community/home-manager/release-22.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -94,14 +95,14 @@ ./loki/configuration.nix ]; - # odinStable = extraModules: nixpkgs.lib.nixosSystem { - # inherit system; - # modules = odinBaseModules ++ [ - # home-manager.nixosModules.home-manager - # homeManagerSettings - # { home-manager.users.bertof = import ./home_manager/odin.nix; } - # ] ++ extraModules; - # }; + odinStable = extraModules: nixpkgs.lib.nixosSystem { + inherit system; + modules = odinBaseModules ++ [ + home-manager.nixosModules.home-manager + homeManagerSettings + { home-manager.users.bertof = import ./home_manager/odin.nix; } + ] ++ extraModules; + }; odinUnstable = extraModules: unstable.lib.nixosSystem { inherit system; @@ -112,14 +113,14 @@ ] ++ extraModules; }; - # thorStable = extraModules: nixpkgs.lib.nixosSystem { - # inherit system; - # modules = thorBaseModules ++ [ - # home-manager.nixosModules.home-manager - # homeManagerSettings - # { home-manager.users.bertof = import ./home_manager/thor.nix; } - # ] ++ extraModules; - # }; + thorStable = extraModules: nixpkgs.lib.nixosSystem { + inherit system; + modules = thorBaseModules ++ [ + home-manager.nixosModules.home-manager + homeManagerSettings + { home-manager.users.bertof = import ./home_manager/thor.nix; } + ] ++ extraModules; + }; thorUnstable = extraModules: unstable.lib.nixosSystem { inherit system; @@ -139,6 +140,15 @@ ] ++ extraModules; }; + lokiStable = extraModules: nixpkgs.lib.nixosSystem { + inherit system; + modules = lokiBaseModules ++ [ + home-manager.nixosModules.home-manager + homeManagerSettings + { home-manager.users.bertof = import ./home_manager/loki.nix; } + ] ++ extraModules; + }; + in { packages.${system} = unstablePkgs; @@ -146,21 +156,21 @@ nixosConfigurations = rec { thor = thor-unstable; - - # thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix]; + thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix]; thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ]; - thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ./nixos_modules/sesar.nix ]; + # thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ./nixos_modules/sesar.nix ]; odin = odin-intel-unstable; - + odin-stable = odin-intel-stable; odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ]; odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ]; - # odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix]; - # odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix]; + odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ]; + odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ]; loki = loki-unstable; - - loki-unstable = lokiUnstable []; + loki-stable = lokiStable []; + loki-unstable = lokiUnstable [ ]; + }; }; } diff --git a/home_manager/modules/helix.nix b/home_manager/modules/helix.nix index ca9f40a..114a934 100644 --- a/home_manager/modules/helix.nix +++ b/home_manager/modules/helix.nix @@ -20,8 +20,9 @@ languages = [ ]; settings = { theme = "monokai_pro_octagon"; - editor.true-color = true; editor.lsp.display-messages = true; + editor.scrolloff = 5; + editor.true-color = true; }; themes = let diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index 8eec21a..e19bf6a 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -75,7 +75,10 @@ # Enable CUPS to print documents. services.printing = { enable = true; - drivers = with pkgs; [ gutenprint cups-kyocera ]; + drivers = with pkgs; [ + gutenprint + # cups-kyocera + ]; }; services.fwupd.enable = true;