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

Fix keyboard configuration and cleanup

Browse source
This commit is contained in:
Filippo Berto 2022-05-11 17:19:15 +02:00
parent 2d937f8f8b
commit d02c81a189
6 changed files with 30 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

56
flake.nix
View file

@ -51,12 +51,8 @@
(rust-overlay.overlay) (rust-overlay.overlay)
(final: prev: { inherit (tex2nix.packages.${system}) tex2nix; }) (final: prev: { inherit (tex2nix.packages.${system}) tex2nix; })
(final: prev: { (final: prev: {
# cocktail-bar-cli = final.callPackage ./custom/cocktail-bar-cli { };
update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; }; update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
lockscreen = final.callPackage ./custom/lockscreen { lockscreen = final.callPackage ./custom/lockscreen { palette = final.rice.colorPalette; font = final.rice.font.normal; };
palette = final.rice.colorPalette;
font = final.rice.font.normal;
};
}) })
(final: prev: { unstable = unstablePkgs; }) (final: prev: { unstable = unstablePkgs; })
]; ];
@ -70,13 +66,7 @@
}; };
pkgs = import nixpkgs nixpkgsSettings; pkgs = import nixpkgs nixpkgsSettings;
unstablePkgs = import unstable nixpkgsSettings; unstablePkgs = import unstable nixpkgsSettings;
homeManagerSettings = { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; };
homeManagerSettings = {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
};
};
odinBaseModules = [ odinBaseModules = [
{ nixpkgs = nixpkgsSettings; } { nixpkgs = nixpkgsSettings; }
@ -95,14 +85,14 @@
./thor/configuration.nix ./thor/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;
@ -113,14 +103,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;
@ -137,18 +127,18 @@
nixosConfigurations = rec { nixosConfigurations = rec {
thor = thor-stable; thor = thor-unstable;
thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ]; # thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ];
thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ]; thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ];
thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ]; thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ];
odin = odin-intel-stable; odin = odin-intel-unstable;
odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ]; odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ];
odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ]; odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ];
odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ]; # odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ];
odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ]; # odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ];
}; };
}; };
} }

4
home_manager/basic_env.nix
View file

@ -2,10 +2,6 @@
{ {
home = { home = {
language.base = "it_IT.UTF-8"; language.base = "it_IT.UTF-8";
keyboard = {
layout = "it";
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
};
packages = with pkgs; [ packages = with pkgs; [
file file
htop htop

6
home_manager/modules/gtk_theme.nix
View file

@ -18,11 +18,13 @@
platformTheme = "gtk"; platformTheme = "gtk";
}; };
xsession = { home = {
pointerCursor = { pointerCursor = {
package = pkgs.qogir-icon-theme; package = pkgs.qogir-icon-theme;
name = "Qogir"; name = "Qogir";
size = 24; # size = 64;
x11.enable = true;
gtk.enable = true;
}; };
}; };
} }

2
home_manager/thor.nix
View file

@ -3,7 +3,7 @@
home = { home = {
language.base = "it_IT.UTF-8"; language.base = "it_IT.UTF-8";
keyboard = { keyboard = {
layout = "it"; layout = "en";
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
}; };
packages = with pkgs; [ packages = with pkgs; [

2
odin/common_configuration.nix
View file

@ -72,7 +72,7 @@
extraLayouts = { extraLayouts = {
eng = { languages = [ "eng" ]; description = "English layout for external keyboard"; }; eng = { languages = [ "eng" ]; description = "English layout for external keyboard"; };
}; };
xkbOptions = "eurosign:e;"; xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
libinput.enable = true; libinput.enable = true;
}; };

2
thor/configuration.nix
View file

@ -138,7 +138,7 @@
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
layout = "us"; layout = "us";
videoDrivers = [ "nvidia" ]; videoDrivers = [ "nvidia" ];
xkbOptions = "eurosign:e"; xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
}; };
# gnome.gnome-remote-desktop.enable = true; # gnome.gnome-remote-desktop.enable = true;
zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; }; zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };