max/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: max:beae68800275280b28adbdd13e9938de9635c7d5
Branches Tags
max:main
..
compare: max:da10edad830d3ee178f848fdd0aa6ef431496909
Branches Tags
max:main

No commits in common. "beae68800275280b28adbdd13e9938de9635c7d5" and "da10edad830d3ee178f848fdd0aa6ef431496909" have entirely different histories.
beae688002 ... da10edad83

8 changed files with 42 additions and 59 deletions
Show Stats Expand all files Collapse all files

6
flake.lock generated
View File

@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732575825, "lastModified": 1732186149,
"narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View File

@ -29,10 +29,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config = { config.allowUnfree = true;
allowUnfree = true;
rocmSupport = true;
};
}; };
in { in {
nixosConfigurations."MaxNixosLaptop" = nixpkgs.lib.nixosSystem { nixosConfigurations."MaxNixosLaptop" = nixpkgs.lib.nixosSystem {

3
hosts/MaxNixosLaptop/configuration.nix
View File

@ -27,9 +27,6 @@
nix.settings = { nix.settings = {
experimental-features = ["nix-command" "flakes"]; experimental-features = ["nix-command" "flakes"];
substituters = ["https://nix-community.cachix.org" "https://cache.nixos.org"]; substituters = ["https://nix-community.cachix.org" "https://cache.nixos.org"];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
}; };
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.

2
modules/home/shell/btop.nix
View File

@ -44,8 +44,6 @@ in {
net_auto = false; net_auto = false;
show_battery = true; show_battery = true;
selected_battery = "Auto"; selected_battery = "Auto";
gpu_mirror_graph = false;
custom_gpu_name0 = "Internal";
}; };
}; };
}; };

10
modules/home/sway/default.nix
View File

@ -201,12 +201,7 @@ in {
{command = "${pkgs.squeekboard}/bin/squeekboard";} {command = "${pkgs.squeekboard}/bin/squeekboard";}
{command = "${pkgs.rot8}/bin/rot8 -n 10 -h ${rotate_lisgd}/bin/rotate_lisgd";} {command = "${pkgs.rot8}/bin/rot8 -n 10 -h ${rotate_lisgd}/bin/rotate_lisgd";}
{command = "${rotate_lisgd}/bin/rotate_lisgd";} {command = "${rotate_lisgd}/bin/rotate_lisgd";}
] ];
++ lib.optional cfg.kanshi.enable
{
command = "${pkgs.kanshi}/bin/kanshictl reload";
always = true;
};
defaultWorkspace = "main"; defaultWorkspace = "main";
workspaceAutoBackAndForth = true; workspaceAutoBackAndForth = true;
@ -237,9 +232,6 @@ in {
{ {
title = "KeePassXC - Access Request"; title = "KeePassXC - Access Request";
} }
{
title = "Extension: (Tree Style Tab) - Close tabs? — Mozilla Firefox";
}
]; ];
}; };

72
modules/home/sway/kanshi.nix
View File

@ -41,11 +41,11 @@ in {
} }
]; ];
profile.exec = [ profile.exec = [
"${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-4" "${pkgs.sway}/bin/swaymsg workspace main, move workspace to DP-4"
"${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-5" "${pkgs.sway}/bin/swaymsg workspace term, move workspace to DP-5"
"${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace msg, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace music, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to DP-4" "${pkgs.sway}/bin/swaymsg workspace 5, move workspace to DP-4"
]; ];
} }
{ {
@ -65,11 +65,11 @@ in {
} }
]; ];
profile.exec = [ profile.exec = [
"${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-4" "${pkgs.sway}/bin/swaymsg workspace main, move workspace to DP-4"
"${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-5" "${pkgs.sway}/bin/swaymsg workspace term, move workspace to DP-5"
"${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace msg, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace music, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to DP-4" "${pkgs.sway}/bin/swaymsg workspace 5, move workspace to DP-4"
]; ];
} }
{ {
@ -89,11 +89,11 @@ in {
} }
]; ];
profile.exec = [ profile.exec = [
"${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-6" "${pkgs.sway}/bin/swaymsg workspace main, move workspace to DP-6"
"${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-7" "${pkgs.sway}/bin/swaymsg workspace term, move workspace to DP-7"
"${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace msg, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace music, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to DP-6" "${pkgs.sway}/bin/swaymsg workspace 5, move workspace to DP-6"
]; ];
} }
{ {
@ -113,11 +113,11 @@ in {
} }
]; ];
profile.exec = [ profile.exec = [
"${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to DP-3" "${pkgs.sway}/bin/swaymsg workspace main, move workspace to DP-3"
"${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to DP-4" "${pkgs.sway}/bin/swaymsg workspace term, move workspace to DP-4"
"${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace msg, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace music, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to DP-3" "${pkgs.sway}/bin/swaymsg workspace 5, move workspace to DP-3"
]; ];
} }
{ {
@ -137,10 +137,10 @@ in {
} }
]; ];
profile.exec = [ profile.exec = [
"${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to '\"Dell Inc. DELL P2422HE 7VWL9M3\"'" "${pkgs.sway}/bin/swaymsg [workspace=\\\"main\\\"] move workspace to '\"Dell Inc. DELL P2422HE 7VWL9M3\"'"
"${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to '\"ViewSonic Corporation VG2448 V5E201960167\"'" "${pkgs.sway}/bin/swaymsg [workspace=\\\"term\\\"] move workspace to '\"ViewSonic Corporation VG2448 V5E201960167\"'"
"${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg [workspace=\\\"msg\\\"] move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg [workspace=\\\"music\\\"] move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to '\"Dell Inc. DELL P2422HE 7VWL9M3\"'" "${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to '\"Dell Inc. DELL P2422HE 7VWL9M3\"'"
]; ];
} }
@ -159,11 +159,11 @@ in {
} }
]; ];
profile.exec = [ profile.exec = [
"${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to HDMI-A-1" "${pkgs.sway}/bin/swaymsg workspace main, move workspace to HDMI-A-1"
"${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace term, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace msg, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace music, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to HDMI-A-1" "${pkgs.sway}/bin/swaymsg workspace 5, move workspace to HDMI-A-1"
]; ];
} }
{ {
@ -178,13 +178,13 @@ in {
} }
]; ];
profile.exec = [ profile.exec = [
"${pkgs.sway}/bin/swaymsg [workspace=main] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace main, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=term] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace term, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=msg] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace msg, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=music] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace music, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=5] move workspace to eDP-1" "${pkgs.sway}/bin/swaymsg workspace 5, move workspace to eDP-1"
"${pkgs.sway}/bin/swaymsg [workspace=mirror] move workspace to HDMI-A-1" "${pkgs.sway}/bin/swaymsg workspace mirror, move workspace to HDMI-A-1"
"${pkgs.sway}/bin/swaymsg [workspace=mirror] exec ${pkgs.wl-mirror}/bin/wl-mirror eDP-1" "${pkgs.sway}/bin/swaymsg workspace mirror, exec ${pkgs.wl-mirror}/bin/wl-mirror eDP-1"
]; ];
} }
]; ];

1
modules/nixos/gpu/amd.nix
View File

@ -23,7 +23,6 @@ in {
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
rocmPackages.clr.icd rocmPackages.clr.icd
rocmPackages.rocm-smi
amdvlk amdvlk
]; ];
extraPackages32 = with pkgs; [ extraPackages32 = with pkgs; [

2
modules/nixos/sops.nix
View File

@ -11,7 +11,7 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
sops = { sops = {
age.keyFile = "/home/max/.config/sops/age/keys.txt"; age.keyFile = /home/max/.config/sops/age/keys.txt;
secrets = { secrets = {
"home/ssid" = { "home/ssid" = {
sopsFile = ../../secrets/wifi.yaml; sopsFile = ../../secrets/wifi.yaml;