289 current 2024-12-13 20:31:11 24.11.20241207.e2605d0 6.12.3 *

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733050161,
+        "lastModified": 1733572789,
-        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
+        "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,
+        "lastModified": 1733863840,
-        "narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=",
+        "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,
+        "lastModified": 1733861262,
-        "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
+        "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,
+        "lastModified": 1733550349,
-        "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
+        "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
+        "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1733212471,
+        "lastModified": 1733759999,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
         "type": "github"
       },
       "original": {

hosts/crocoite/crocoite.nix

@@ -67,7 +67,7 @@
 
     ../../modules/users
 
-    ../../modules/specific_hardware
+    ../../modules/hardware
 
     ../../modules/sec_auth
 

modules/customisation.nix

@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  #MANPAGER='nvim +Man!'
+  environment.systemPackages = [pkgs.neovim];
+  environment.variables = {
+    "MANPAGER" = "nvim +Man!";
+    "EDITOR" = "nvim";
+  };
+}

modules/default.nix

@@ -1,6 +1,7 @@
 {...}: {
   imports = [
-    ./boot_theming.nix
+    #./plymouth.nix
+    ./customisation.nix
     ./environment.nix
     ./locale.nix
     ./networking.nix

modules/hardware/default.nix

@@ -3,5 +3,7 @@
     ./bluetooth.nix
     ./fwupd.nix
     ./scan_and_print.nix
+    ./trackpoint.nix
+    ./gpu.nix
   ];
 }

modules/hardware/gpu.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  hardware.graphics.enable = true;
+  hardware.graphics.extraPackages = with pkgs; [
+    libvdpau-va-gl
+  ];
+}

modules/hardware/trackpoint.nix

@@ -0,0 +1,4 @@
+{...}: {
+  # probably does nothing on my amd laptop. need to check
+  hardware.trackpoint.speed = 200;
+}

modules/networking.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  lib,
-  ...
-}: {
   # 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.allowedTCPPorts = [8080 10001 10002];
-  networking.firewall.allowedUDPPorts = [8080];
+  networking.firewall.allowedUDPPorts = [8080 10001 10002];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 

modules/pkg_mgrmnt/default.nix

@@ -3,5 +3,6 @@
     ./flatpak.nix
     ./podman.nix
     ./store_pkg_file.nix
+    ./garbage-collect.nix
   ];
 }

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";
+    };
+  };
+}

modules/sec_auth/login-manager.nix

@@ -11,6 +11,8 @@
                               --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

modules/software/android.nix

@@ -0,0 +1,5 @@
+{...}: {
+  # for running android apps
+  # also starts the systemd service waydroid-container
+  virtualisation.waydroid.enable = true;
+}

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
   ];
 }

modules/software/default.nix

@@ -7,5 +7,6 @@
     ./shell.nix
     ./software.nix
     ./virt.nix
+    ./android.nix
   ];
 }

modules/software/software.nix

@@ -59,7 +59,8 @@
       nuclear
       mpv
       zathura
-      feh
+      #feh
+      nomacs
       #unstable.obsidian
       keepassxc
       #minecraft

modules/software/virt.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  inputs,
-  config,
-  ...
-}: {
   # 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
+  ];
 }

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;
+    }
+  '';
+}

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;