bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix odin config

Browse source
This commit is contained in:
Filippo Berto 2022-05-31 13:21:39 +02:00
parent 7dbae6094e
commit a692b53f91
4 changed files with 50 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

@ -22,16 +22,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1651519540, "lastModified": 1653937612,
"narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", "narHash": "sha256-HybwffYKOM3UwlY54ZVCZgX7o5xpp2KhbZyyOnvwFMo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", "rev": "bda2c80b4c1a8d85c84c343a25ac7303fbc7999d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-21.11", "ref": "release-22.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -73,16 +73,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1652544513, "lastModified": 1653979012,
"narHash": "sha256-lFmU0/qodaMd6e7niNfrmi9tGxTcvE2etnNoTAxl7ho=", "narHash": "sha256-Md1OeSa4WwrtsjJKanOyrNfo9WbRCgURk23iRhUI2LU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6879c4f633ef6adeaeb3964c03964f7c3acd7f42", "rev": "9b5e34626fbb7c251bf2c994f0b4334ab21df631",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-21.11", "ref": "release-22.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

62
flake.nix
View file

@ -2,10 +2,11 @@
description = "Thor system configuration"; description = "Thor system configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-21.11";
nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-21.11"; url = "github:nix-community/home-manager/release-22.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -94,14 +95,14 @@
./loki/configuration.nix ./loki/configuration.nix
]; ];
# odinStable = extraModules: nixpkgs.lib.nixosSystem { odinStable = extraModules: nixpkgs.lib.nixosSystem {
# inherit system; inherit system;
# modules = odinBaseModules ++ [ modules = odinBaseModules ++ [
# home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# homeManagerSettings homeManagerSettings
# { home-manager.users.bertof = import ./home_manager/odin.nix; } { home-manager.users.bertof = import ./home_manager/odin.nix; }
# ] ++ extraModules; ] ++ extraModules;
# }; };
odinUnstable = extraModules: unstable.lib.nixosSystem { odinUnstable = extraModules: unstable.lib.nixosSystem {
inherit system; inherit system;
@ -112,14 +113,14 @@
] ++ extraModules; ] ++ extraModules;
}; };
# thorStable = extraModules: nixpkgs.lib.nixosSystem { thorStable = extraModules: nixpkgs.lib.nixosSystem {
# inherit system; inherit system;
# modules = thorBaseModules ++ [ modules = thorBaseModules ++ [
# home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# homeManagerSettings homeManagerSettings
# { home-manager.users.bertof = import ./home_manager/thor.nix; } { home-manager.users.bertof = import ./home_manager/thor.nix; }
# ] ++ extraModules; ] ++ extraModules;
# }; };
thorUnstable = extraModules: unstable.lib.nixosSystem { thorUnstable = extraModules: unstable.lib.nixosSystem {
inherit system; inherit system;
@ -139,6 +140,15 @@
] ++ extraModules; ] ++ 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 in
{ {
packages.${system} = unstablePkgs; packages.${system} = unstablePkgs;
@ -146,21 +156,21 @@
nixosConfigurations = rec { nixosConfigurations = rec {
thor = thor-unstable; 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-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 = 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-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-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-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-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
loki = loki-unstable; loki = loki-unstable;
loki-stable = lokiStable [];
loki-unstable = lokiUnstable []; loki-unstable = lokiUnstable [ ];
}; };
}; };
} }

3
home_manager/modules/helix.nix
View file

@ -20,8 +20,9 @@
languages = [ ]; languages = [ ];
settings = { settings = {
theme = "monokai_pro_octagon"; theme = "monokai_pro_octagon";
editor.true-color = true;
editor.lsp.display-messages = true; editor.lsp.display-messages = true;
editor.scrolloff = 5;
editor.true-color = true;
}; };
themes = themes =
let let

5
odin/common_configuration.nix
View file

@ -75,7 +75,10 @@
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing = { services.printing = {
enable = true; enable = true;
drivers = with pkgs; [ gutenprint cups-kyocera ]; drivers = with pkgs; [
gutenprint
# cups-kyocera
];
}; };
services.fwupd.enable = true; services.fwupd.enable = true;