diff --git a/flake.nix b/flake.nix index 9f215f8..2d390f7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,14 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - + catppuccin.url = "github:catppuccin/nix"; agenix.url = "github:ryantm/agenix"; @@ -30,11 +30,11 @@ url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; - }; + }; outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, lix-module, ... } @ inputs: { nixosConfigurations.rhea-laptop = nixpkgs.lib.nixosSystem { - specialArgs = { + specialArgs = { inherit inputs; inherit spicetify-nix; inherit agenix; diff --git a/home/alacritty.nix b/home/alacritty.nix index da3e60b..3653ba8 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -3,4 +3,4 @@ enable = true; catppuccin.enable = true; }; -} \ No newline at end of file +} diff --git a/home/blueman.nix b/home/blueman.nix index 819e0b5..10ce408 100644 --- a/home/blueman.nix +++ b/home/blueman.nix @@ -1,3 +1,3 @@ { services.blueman-applet.enable = true; -} \ No newline at end of file +} diff --git a/home/default.nix b/home/default.nix index f4e61f1..264501d 100644 --- a/home/default.nix +++ b/home/default.nix @@ -11,7 +11,7 @@ useUserPackages = true; useGlobalPkgs = true; - extraSpecialArgs = { + extraSpecialArgs = { inherit spicetify-nix; inherit agenix; }; diff --git a/home/direnv.nix b/home/direnv.nix index 6cdc40f..fb7dffc 100644 --- a/home/direnv.nix +++ b/home/direnv.nix @@ -4,4 +4,4 @@ enableZshIntegration = true; nix-direnv.enable = true; }; -} \ No newline at end of file +} diff --git a/home/easyeffects.nix b/home/easyeffects.nix index 9589ce1..8b6b8cb 100644 --- a/home/easyeffects.nix +++ b/home/easyeffects.nix @@ -5,4 +5,4 @@ preset = "Gracefu's Edits"; }; -} \ No newline at end of file +} diff --git a/home/hyprland.nix b/home/hyprland.nix index abf8083..59fc1c5 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -102,13 +102,14 @@ "$mod" = "SUPER"; - bind = let - alacritty = lib.getExe pkgs.alacritty; - hyprshot = lib.getExe pkgs.hyprshot; - wofi = lib.getExe pkgs.wofi; - swaylock = lib.getExe pkgs.swaylock; - workspaces = ["1" "2" "3" "4" "5" "6" "7" "8" "9"]; - in + bind = + let + alacritty = lib.getExe pkgs.alacritty; + hyprshot = lib.getExe pkgs.hyprshot; + wofi = lib.getExe pkgs.wofi; + swaylock = lib.getExe pkgs.swaylock; + workspaces = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" ]; + in [ # Main binds "$mod SHIFT,M,exit," @@ -160,27 +161,31 @@ ++ (map (n: "$mod,${n},workspace,${n}") workspaces) ++ (map (n: "$mod SHIFT,${n},movetoworkspacesilent,${n}") workspaces); - bindel = let - brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl"; - wpctl = lib.getExe' pkgs.wireplumber "wpctl"; - in [ - ", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+" - ", XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%-" - " ,XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" - ", XF86MonBrightnessUp,exec, ${brightnessctl} s 5%+" - ", XF86MonBrightnessDown,exec, ${brightnessctl} s 5%-" - ]; + bindel = + let + brightnessctl = lib.getExe' pkgs.brightnessctl "brightnessctl"; + wpctl = lib.getExe' pkgs.wireplumber "wpctl"; + in + [ + ", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+" + ", XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%-" + " ,XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" + ", XF86MonBrightnessUp,exec, ${brightnessctl} s 5%+" + ", XF86MonBrightnessDown,exec, ${brightnessctl} s 5%-" + ]; - bindl = let - playerctl = lib.getExe' pkgs.playerctl "playerctl"; - swaylock = lib.getExe pkgs.swaylock; - in [ - ", XF86AudioPrev, exec, ${playerctl} previous" - ", XF86AudioPlay, exec, ${playerctl} play-pause" - ", XF86AudioNext, exec, ${playerctl} next" - ", switch:on:Lid Switch, exec, ${swaylock}" - ", switch:on:Lid Switch, exec, systemctl suspend" - ]; + bindl = + let + playerctl = lib.getExe' pkgs.playerctl "playerctl"; + swaylock = lib.getExe pkgs.swaylock; + in + [ + ", XF86AudioPrev, exec, ${playerctl} previous" + ", XF86AudioPlay, exec, ${playerctl} play-pause" + ", XF86AudioNext, exec, ${playerctl} next" + ", switch:on:Lid Switch, exec, ${swaylock}" + ", switch:on:Lid Switch, exec, systemctl suspend" + ]; bindm = [ "$mod, mouse:272, movewindow" diff --git a/home/keyring.nix b/home/keyring.nix index 1558dcc..b1faa4f 100644 --- a/home/keyring.nix +++ b/home/keyring.nix @@ -2,6 +2,6 @@ services.gnome-keyring = { enable = true; - components = ["secrets" "pkcs11" "ssh"]; + components = [ "secrets" "pkcs11" "ssh" ]; }; -} \ No newline at end of file +} diff --git a/home/spicetify.nix b/home/spicetify.nix index df35742..413abb1 100644 --- a/home/spicetify.nix +++ b/home/spicetify.nix @@ -1,18 +1,18 @@ { inputs, pkgs, config, spicetify-nix, ... }: { programs.spicetify = - let - spicePkgs = spicetify-nix.legacyPackages.${pkgs.system}; - in - { - enable = true; - enabledExtensions = with spicePkgs.extensions; [ - shuffle - trashbin - featureShuffle - history - oneko - ]; - theme = spicePkgs.themes.text; - }; -} \ No newline at end of file + let + spicePkgs = spicetify-nix.legacyPackages.${pkgs.system}; + in + { + enable = true; + enabledExtensions = with spicePkgs.extensions; [ + shuffle + trashbin + featureShuffle + history + oneko + ]; + theme = spicePkgs.themes.text; + }; +} diff --git a/home/ssh.nix b/home/ssh.nix index e4c6130..c0784a8 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -27,4 +27,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/home/swaylock.nix b/home/swaylock.nix index ed2e255..0981522 100644 --- a/home/swaylock.nix +++ b/home/swaylock.nix @@ -3,35 +3,35 @@ enable = true; settings = { - color="1e1e2e"; - bs-hl-color="f5e0dc"; - caps-lock-bs-hl-color="f5e0dc"; - caps-lock-key-hl-color="a6e3a1"; - inside-color="00000000"; - inside-clear-color="00000000"; - inside-caps-lock-color="00000000"; - inside-ver-color="00000000"; - inside-wrong-color="00000000"; - key-hl-color="a6e3a1"; - layout-bg-color="00000000"; - layout-border-color="00000000"; - layout-text-color="cdd6f4"; - line-color="00000000"; - line-clear-color="00000000"; - line-caps-lock-color="00000000"; - line-ver-color="00000000"; - line-wrong-color="00000000"; - ring-color="b4befe"; - ring-clear-color="f5e0dc"; - ring-caps-lock-color="fab387"; - ring-ver-color="89b4fa"; - ring-wrong-color="eba0ac"; - separator-color="00000000"; - text-color="cdd6f4"; - text-clear-color="f5e0dc"; - text-caps-lock-color="fab387"; - text-ver-color="89b4fa"; - text-wrong-color="eba0ac"; + color = "1e1e2e"; + bs-hl-color = "f5e0dc"; + caps-lock-bs-hl-color = "f5e0dc"; + caps-lock-key-hl-color = "a6e3a1"; + inside-color = "00000000"; + inside-clear-color = "00000000"; + inside-caps-lock-color = "00000000"; + inside-ver-color = "00000000"; + inside-wrong-color = "00000000"; + key-hl-color = "a6e3a1"; + layout-bg-color = "00000000"; + layout-border-color = "00000000"; + layout-text-color = "cdd6f4"; + line-color = "00000000"; + line-clear-color = "00000000"; + line-caps-lock-color = "00000000"; + line-ver-color = "00000000"; + line-wrong-color = "00000000"; + ring-color = "b4befe"; + ring-clear-color = "f5e0dc"; + ring-caps-lock-color = "fab387"; + ring-ver-color = "89b4fa"; + ring-wrong-color = "eba0ac"; + separator-color = "00000000"; + text-color = "cdd6f4"; + text-clear-color = "f5e0dc"; + text-caps-lock-color = "fab387"; + text-ver-color = "89b4fa"; + text-wrong-color = "eba0ac"; }; }; -} \ No newline at end of file +} diff --git a/home/udiskie.nix b/home/udiskie.nix index 8d78b69..171b92b 100644 --- a/home/udiskie.nix +++ b/home/udiskie.nix @@ -4,4 +4,4 @@ automount = true; notify = true; }; -} \ No newline at end of file +} diff --git a/home/wofi.nix b/home/wofi.nix index c0c2eaf..8ba10db 100644 --- a/home/wofi.nix +++ b/home/wofi.nix @@ -4,45 +4,45 @@ enable = true; style = '' -window { -margin: 0px; -border: 1px solid #88c0d0; -background-color: #2e3440; -} + window { + margin: 0px; + border: 1px solid #88c0d0; + background-color: #2e3440; + } -#input { -margin: 5px; -border: none; -color: #d8dee9; -background-color: #3b4252; -} + #input { + margin: 5px; + border: none; + color: #d8dee9; + background-color: #3b4252; + } -#inner-box { -margin: 5px; -border: none; -background-color: #2e3440; -} + #inner-box { + margin: 5px; + border: none; + background-color: #2e3440; + } -#outer-box { -margin: 5px; -border: none; -background-color: #2e3440; -} + #outer-box { + margin: 5px; + border: none; + background-color: #2e3440; + } -#scroll { -margin: 0px; -border: none; -} + #scroll { + margin: 0px; + border: none; + } -#text { -margin: 5px; -border: none; -color: #d8dee9; -} + #text { + margin: 5px; + border: none; + color: #d8dee9; + } -#entry:selected { -background-color: #3b4252; -} -''; + #entry:selected { + background-color: #3b4252; + } + ''; }; } diff --git a/home/zsh.nix b/home/zsh.nix index 80fa348..36b8549 100644 --- a/home/zsh.nix +++ b/home/zsh.nix @@ -3,7 +3,7 @@ programs.zsh = { enable = true; - + autocd = true; shellAliases = { os-update = "nh os switch /home/rhea/nix-config/"; @@ -104,7 +104,7 @@ time = { disabled = false; format = ''\[[$time]($style)\]''; - }; + }; }; }; -} \ No newline at end of file +} diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix index 5e36962..e1f8c6e 100644 --- a/modules/bluetooth.nix +++ b/modules/bluetooth.nix @@ -5,4 +5,4 @@ }; services.blueman.enable = true; -} \ No newline at end of file +} diff --git a/modules/configuration.nix b/modules/configuration.nix index fd539bd..41984ef 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -55,10 +55,10 @@ programs.zsh.enable = true; - environment.sessionVariables = { + environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; - + # Enable Flakes nix.settings.experimental-features = [ "nix-command" "flakes" ]; diff --git a/modules/default.nix b/modules/default.nix index ae4cfc9..2ee3bd6 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,4 +13,4 @@ ./diskservices.nix ./bluetooth.nix ]; -} \ No newline at end of file +} diff --git a/modules/diskservices.nix b/modules/diskservices.nix index 750e961..fa2ded2 100644 --- a/modules/diskservices.nix +++ b/modules/diskservices.nix @@ -1,4 +1,4 @@ { services.gvfs.enable = true; services.udisks2.enable = true; -} \ No newline at end of file +} diff --git a/modules/environment.nix b/modules/environment.nix index af8c514..7f56d52 100644 --- a/modules/environment.nix +++ b/modules/environment.nix @@ -1,3 +1,3 @@ { environment.pathsToLink = [ "/share/zsh" ]; -} \ No newline at end of file +} diff --git a/modules/fingerprint.nix b/modules/fingerprint.nix index f99efcd..069a1e5 100644 --- a/modules/fingerprint.nix +++ b/modules/fingerprint.nix @@ -1,4 +1,4 @@ -{ pkgs, ...}: +{ pkgs, ... }: { services.fprintd = { enable = true; diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix index b88ea44..fedb894 100644 --- a/modules/hardware-configuration.nix +++ b/modules/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; @@ -14,19 +15,20 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-label/nix-root"; + { + device = "/dev/disk/by-label/nix-root"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-label/EFI"; + { + device = "/dev/disk/by-label/EFI"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-label/swap"; } - ]; + [{ device = "/dev/disk/by-label/swap"; }]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/modules/networking.nix b/modules/networking.nix index c8e56bb..36761bf 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -9,4 +9,4 @@ networking.firewall = { allowedUDPPorts = [ 51820 ]; # Clients and peers can use the same port, see listenport }; -} \ No newline at end of file +} diff --git a/modules/polkit.nix b/modules/polkit.nix index f9cd613..7435da0 100644 --- a/modules/polkit.nix +++ b/modules/polkit.nix @@ -3,17 +3,17 @@ security.polkit.enable = true; systemd = { - user.services.polkit-gnome-authentication-agent-1 = { - description = "polkit-gnome-authentication-agent-1"; - wantedBy = [ "graphical-session.target" ]; - wants = [ "graphical-session.target" ]; - serviceConfig = { + user.services.polkit-gnome-authentication-agent-1 = { + description = "polkit-gnome-authentication-agent-1"; + wantedBy = [ "graphical-session.target" ]; + wants = [ "graphical-session.target" ]; + serviceConfig = { Type = "simple"; ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; Restart = "on-failure"; RestartSec = 1; TimeoutStopSec = 10; }; + }; }; -}; -} \ No newline at end of file +} diff --git a/modules/power-profiles.nix b/modules/power-profiles.nix index 98472ed..ac368fe 100644 --- a/modules/power-profiles.nix +++ b/modules/power-profiles.nix @@ -2,4 +2,4 @@ services.power-profiles-daemon = { enable = true; }; -} \ No newline at end of file +} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index e498b10..11c645b 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -10,4 +10,4 @@ in "sign_etwas.age".publicKeys = [ rhea-laptop ]; "fbda_wg_priv_key.age".publicKeys = [ rhea-laptop ]; "fbda_wg_psk.age".publicKeys = [ rhea-laptop ]; -} \ No newline at end of file +}