diff --git a/flake.lock b/flake.lock index cd0aea8..7e504a0 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1733345341, - "narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=", + "lastModified": 1733863840, + "narHash": "sha256-OO/yx700wpyKjFmsNlxep57pUIVCA1OlfEN1qUrxgCY=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b", + "rev": "eb6f90693f91a7ce082c0c2c78627049265bc599", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733261153, - "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix index bfbafbd..4a75200 100644 --- a/hosts/crocoite/crocoite.nix +++ b/hosts/crocoite/crocoite.nix @@ -67,7 +67,7 @@ ../../modules/users - ../../modules/specific_hardware + ../../modules/hardware ../../modules/sec_auth diff --git a/modules/customisation.nix b/modules/customisation.nix new file mode 100644 index 0000000..1179963 --- /dev/null +++ b/modules/customisation.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + #MANPAGER='nvim +Man!' + environment.systemPackages = [pkgs.neovim]; + environment.variables = { + "MANPAGER" = "nvim +Man!"; + "EDITOR" = "nvim"; + }; +} diff --git a/modules/default.nix b/modules/default.nix index 9a104ec..1e0352a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,6 +1,7 @@ {...}: { imports = [ - ./boot_theming.nix + #./plymouth.nix + ./customisation.nix ./environment.nix ./locale.nix ./networking.nix diff --git a/modules/specific_hardware/bluetooth.nix b/modules/hardware/bluetooth.nix similarity index 100% rename from modules/specific_hardware/bluetooth.nix rename to modules/hardware/bluetooth.nix diff --git a/modules/specific_hardware/default.nix b/modules/hardware/default.nix similarity index 72% rename from modules/specific_hardware/default.nix rename to modules/hardware/default.nix index d64c479..2b92f71 100644 --- a/modules/specific_hardware/default.nix +++ b/modules/hardware/default.nix @@ -3,5 +3,7 @@ ./bluetooth.nix ./fwupd.nix ./scan_and_print.nix + ./trackpoint.nix + ./gpu.nix ]; } diff --git a/modules/specific_hardware/fwupd.nix b/modules/hardware/fwupd.nix similarity index 100% rename from modules/specific_hardware/fwupd.nix rename to modules/hardware/fwupd.nix diff --git a/modules/hardware/gpu.nix b/modules/hardware/gpu.nix new file mode 100644 index 0000000..13c2a0b --- /dev/null +++ b/modules/hardware/gpu.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + hardware.graphics.enable = true; + hardware.graphics.extraPackages = with pkgs; [ + libvdpau-va-gl + ]; +} diff --git a/modules/specific_hardware/scan_and_print.nix b/modules/hardware/scan_and_print.nix similarity index 100% rename from modules/specific_hardware/scan_and_print.nix rename to modules/hardware/scan_and_print.nix diff --git a/modules/hardware/trackpoint.nix b/modules/hardware/trackpoint.nix new file mode 100644 index 0000000..aca3024 --- /dev/null +++ b/modules/hardware/trackpoint.nix @@ -0,0 +1,4 @@ +{...}: { + # probably does nothing on my amd laptop. need to check + hardware.trackpoint.speed = 200; +} diff --git a/modules/networking.nix b/modules/networking.nix index a014593..c11e001 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -1,8 +1,4 @@ -{ - pkgs, - lib, - ... -}: { +{pkgs, ...}: { # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; @@ -33,8 +29,8 @@ # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [8080]; - networking.firewall.allowedUDPPorts = [8080]; + networking.firewall.allowedTCPPorts = [8080 10001 10002]; + networking.firewall.allowedUDPPorts = [8080 10001 10002]; # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/modules/pkg_mgrmnt/default.nix b/modules/pkg_mgrmnt/default.nix index 85f07d2..57e40d2 100644 --- a/modules/pkg_mgrmnt/default.nix +++ b/modules/pkg_mgrmnt/default.nix @@ -3,5 +3,6 @@ ./flatpak.nix ./podman.nix ./store_pkg_file.nix + ./garbage-collect.nix ]; } diff --git a/modules/pkg_mgrmnt/garbage-collect.nix b/modules/pkg_mgrmnt/garbage-collect.nix new file mode 100644 index 0000000..46a517b --- /dev/null +++ b/modules/pkg_mgrmnt/garbage-collect.nix @@ -0,0 +1,15 @@ +{...}: { + nix = { + optimise = { + automatic = true; + dates = ["16:00" "08:00"]; + }; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 2d"; + persistent = true; + randomizedDelaySec = "1h"; + }; + }; +} diff --git a/modules/boot_theming.nix b/modules/plymouth.nix similarity index 100% rename from modules/boot_theming.nix rename to modules/plymouth.nix diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login-manager.nix index 7c6801a..73c7dcf 100644 --- a/modules/sec_auth/login-manager.nix +++ b/modules/sec_auth/login-manager.nix @@ -7,12 +7,14 @@ settings = { default_session = { command = '' ${pkgs.greetd.tuigreet}/bin/tuigreet \ - --time \ - --time-format '%Y-%m-%dT%H:%M:%S %A' \ - --remember \ - --user-menu \ - --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \ - --cmd Hyprland''; + --time \ + --time-format '%Y-%m-%dT%H:%M:%S %A' \ + --remember \ + --user-menu \ + --user-menu-min-uid 1000 \ + --user-menu-max-uid 2000 \ + --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \ + --cmd Hyprland''; # removed elements from theme: container user = "greeter"; }; diff --git a/modules/software/android.nix b/modules/software/android.nix new file mode 100644 index 0000000..766f4f4 --- /dev/null +++ b/modules/software/android.nix @@ -0,0 +1,5 @@ +{...}: { + # for running android apps + # also starts the systemd service waydroid-container + virtualisation.waydroid.enable = true; +} diff --git a/modules/software/audio_video.nix b/modules/software/audio_video.nix index 0b9b463..ca73e58 100644 --- a/modules/software/audio_video.nix +++ b/modules/software/audio_video.nix @@ -26,7 +26,7 @@ "plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; "label" = "noise_suppressor_stereo"; "control" = { - "VAD Threshold (%)" = 50.0; + "VAD Threshold (%)" = 75.0; }; } ]; @@ -54,5 +54,7 @@ easyeffects pwvucontrol lxqt.pavucontrol-qt + + roc-toolkit ]; } diff --git a/modules/software/default.nix b/modules/software/default.nix index d6f8fb9..760ee11 100644 --- a/modules/software/default.nix +++ b/modules/software/default.nix @@ -7,5 +7,6 @@ ./shell.nix ./software.nix ./virt.nix + ./android.nix ]; } diff --git a/modules/software/software.nix b/modules/software/software.nix index 441ab74..d567312 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -59,7 +59,8 @@ nuclear mpv zathura - feh + #feh + nomacs #unstable.obsidian keepassxc #minecraft diff --git a/modules/software/virt.nix b/modules/software/virt.nix index b857c89..29a6c8e 100644 --- a/modules/software/virt.nix +++ b/modules/software/virt.nix @@ -1,9 +1,4 @@ -{ - pkgs, - inputs, - config, - ... -}: { +{pkgs, ...}: { # for running android apps virtualisation.waydroid.enable = true; # also starts the systemd service waydroid-container @@ -11,4 +6,7 @@ # virt manager, for running VM's virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; + environment.systemPackages = with pkgs; [ + virt-viewer + ]; } diff --git a/modules/wm_and_de/components/rofi.nix b/modules/wm_and_de/components/rofi.nix new file mode 100644 index 0000000..f7843aa --- /dev/null +++ b/modules/wm_and_de/components/rofi.nix @@ -0,0 +1,131 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + rofi-wayland + ]; + + xdg.configFile."rofi/theme.rasi".text = '' + * { + bg-col: #1D2021; + bg-col-light: #282828; + border-col: #A89984; + selected-col: #3C3836; + green: #98971A; + fg-col: #FBF1C7; + fg-col2: #EBDBB2; + grey: #BDAE93; + highlight: @green; + } + ''; + + xdg.configFile."rofi/config.rasi".text = '' + configuration{ + modi: "run,drun,window"; + lines: 5; + cycle: false; + font: "JetBrainsMono NF Bold 15"; + show-icons: true; + icon-theme: "Papirus-dark"; + terminal: "kitty"; + drun-display-format: "{icon} {name}"; + location: 0; + disable-history: true; + hide-scrollbar: true; + display-drun: " Apps "; + display-run: " Run "; + display-window: " Window "; + /* display-Network: " Network"; */ + sidebar-mode: true; + sorting-method: "fzf"; + } + + @theme "theme" + + element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; + } + + window { + height: 600px; + width: 900px; + border: 2px; + border-color: @border-col; + background-color: @bg-col; + } + + mainbox { + background-color: @bg-col; + } + + inputbar { + children: [prompt,entry]; + background-color: @bg-col-light; + border-radius: 5px; + padding: 0px; + } + + prompt { + background-color: @green; + padding: 4px; + text-color: @bg-col-light; + border-radius: 3px; + margin: 10px 0px 10px 10px; + } + + textbox-prompt-colon { + expand: false; + str: ":"; + } + + entry { + padding: 6px; + margin: 10px 10px 10px 5px; + text-color: @fg-col; + background-color: @bg-col; + border-radius: 3px; + } + + listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 6px; + columns: 3; + background-color: @bg-col; + cycle: true; + } + + element { + padding: 8px; + margin: 0px 10px 4px 4px; + background-color: @bg-col; + text-color: @fg-col; + } + + element-icon { + size: 28px; + } + + element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; + border-radius: 3px; + } + + mode-switcher { + spacing: 0; + } + + button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; + } + + button selected { + background-color: @bg-col; + text-color: @green; + } + ''; +} diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix index 06d4f07..9eb04e7 100644 --- a/modules/wm_and_de/hyprland.nix +++ b/modules/wm_and_de/hyprland.nix @@ -1,4 +1,7 @@ {pkgs, ...}: { + #imports = [ + # ./components/rofi.nix + #]; # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = false;