diff --git a/flake.nix b/flake.nix index e5701f0..ecdf6c8 100644 --- a/flake.nix +++ b/flake.nix @@ -40,27 +40,5 @@ inputs.home-manager.nixosModules.default ]; }; - - homeConfigurations = { - "caperren@cap-slim7" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraModules = [ - ./home/caperren/common.nix - ./home/caperren/laptop.nix - ]; - username = "caperren"; - homeDirectory = "/home/caperren"; - }; - - "caperren@cap-nr200p" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraModules = [ - ./home/caperren/common.nix - ./home/caperren/desktop1.nix - ]; - username = "caperren"; - homeDirectory = "/home/caperren"; - }; - }; }; } diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix index 1be80a6..3c8524d 100644 --- a/hosts/cap-nr200p/configuration.nix +++ b/hosts/cap-nr200p/configuration.nix @@ -22,6 +22,7 @@ ../../modules/system/desktop.nix ../../modules/system/fonts.nix ../../modules/system/gpu-nvidia.nix + ../../modules/system/home-manager-settings.nix ../../modules/system/hyprland.nix ../../modules/system/internationalization.nix ../../modules/system/networking.nix diff --git a/hosts/cap-slim7/configuration.nix b/hosts/cap-slim7/configuration.nix index 8ba226b..baebf46 100644 --- a/hosts/cap-slim7/configuration.nix +++ b/hosts/cap-slim7/configuration.nix @@ -17,6 +17,7 @@ ../../modules/system/displaylink.nix ../../modules/system/fonts.nix ../../modules/system/gpu-amd.nix + ../../modules/system/home-manager-settings.nix ../../modules/system/hyprland.nix ../../modules/system/internationalization.nix ../../modules/system/laptop.nix diff --git a/modules/system/home-manager-settings.nix b/modules/system/home-manager-settings.nix new file mode 100644 index 0000000..cdad9dc --- /dev/null +++ b/modules/system/home-manager-settings.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: +{ + home-manager.useGlobalPkgs = true; + home-manager.backupFileExtension = "bkp"; +} \ No newline at end of file diff --git a/users/caperren/caperren.nix b/users/caperren/caperren.nix index fce03e8..7d3da2a 100644 --- a/users/caperren/caperren.nix +++ b/users/caperren/caperren.nix @@ -1,4 +1,7 @@ { config, pkgs, ... }: +let + kanshiConfigPath = ./. + "/dotfiles/kanshi/${config.networking.hostName}/config"; +in { users.users.caperren = { isNormalUser = true; @@ -11,8 +14,24 @@ "plugdev" "adbusers" ]; - packages = with pkgs; [ + }; + + home-manager.users.caperren = { + home.username = "caperren"; + home.homeDirectory = "/home/caperren"; + home.stateVersion = "25.05"; + + home.packages = with pkgs; [ obsidian ]; + + programs.git = { + enable = true; + userName = "Corwin Perren"; + userEmail = "caperren@gmail.com"; + }; + + home.file.".config/kanshi/config".source = kanshiConfigPath; + home.file.".config/wlogout/layout".source = ./dotfiles/wlogout/layout; }; } diff --git a/users/caperren/dotfiles/kanshi/cap-nr200p/config b/users/caperren/dotfiles/kanshi/cap-nr200p/config new file mode 100644 index 0000000..4fa9757 --- /dev/null +++ b/users/caperren/dotfiles/kanshi/cap-nr200p/config @@ -0,0 +1 @@ +# `hyprctl monitors list` for all outputs \ No newline at end of file diff --git a/users/caperren/dotfiles/kanshi/cap-slim7/config b/users/caperren/dotfiles/kanshi/cap-slim7/config new file mode 100644 index 0000000..6c78dec --- /dev/null +++ b/users/caperren/dotfiles/kanshi/cap-slim7/config @@ -0,0 +1,26 @@ +# `hyprctl monitors list` for all outputs + +profile builtin_only { + output "BOE 0x0A9B Unknown" enable mode 2560x1600@165Hz position 0,0 adaptive_sync on +} + +profile bedroom_desk { + # Top left to right + output "Dell Inc. DELL P2411H F8NDP11G0DVU" enable position 0,1280 + output "Acer Technologies CB292CU 2217018D42410" enable position 1920,0 transform 90 + output "DLOGIC Ltd. No Monitor USB_601e-21H1" enable position 3000,1280 + # output "DLOGIC Ltd. No Monitor USB_601e-21H1" mode --custom 1920x1080@60Hz enable position 3000,1280 + + # Bottom left to right + output "Aculab Ltd Digital Unknown" enable transform 270 position 0,2360 + output "Hewlett Packard HP Z27n CNK7311DRR" enable position 1440,2560 + output "Aculab Ltd QHD270 Unknown" enable transform 90 position 4000,2360 + + # Far bottom right (laptop itself) + output "BOE 0x0A9B Unknown" enable position 5440,2360 adaptive_sync on +} + +profile scotts_apartment_tv { + output "BOE 0x0A9B Unknown" enable mode 2560x1600@165Hz position 0,0 adaptive_sync on + output "Hisense Electric Co., Ltd. HISENSE 0x00000001" enable mode 1920x1080@60Hz position 2560,0 +} diff --git a/users/caperren/dotfiles/wlogout/layout b/users/caperren/dotfiles/wlogout/layout new file mode 100644 index 0000000..a0523d4 --- /dev/null +++ b/users/caperren/dotfiles/wlogout/layout @@ -0,0 +1,24 @@ +{ + "label" : "lock", + "action" : "hyprlock", + "text" : "Lock", + "keybind" : "l" +} +{ + "label" : "logout", + "action" : "loginctl terminate-user $USER", + "text" : "Logout", + "keybind" : "e" +} +{ + "label" : "shutdown", + "action" : "systemctl poweroff", + "text" : "Shutdown", + "keybind" : "s" +} +{ + "label" : "reboot", + "action" : "systemctl reboot", + "text" : "Reboot", + "keybind" : "r" +} \ No newline at end of file