flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709485962,
+        "lastModified": 1709204054,
-        "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=",
+        "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d579633ff9915a8f4058d5c439281097e92380a8",
+        "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
         "type": "github"
       },
       "original": {
@@ -22,16 +22,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709309926,
+        "lastModified": 1709237383,
-        "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
+        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
+        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,8 +2,7 @@
   description = "Torjus nixos config flake";
 
   inputs = {
-    # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";

home/default.nix

@@ -11,12 +11,10 @@
         ./programs/tmux
         ./programs/dunst
         ./programs/kitty
-        ./programs/rofi
         ./scripts
         ./zsh
         ./packages
         ./hyprland
-        ./i3
       ];
       firefox.enable = true;
       tmux.enable = true;

home/hyprland/cursor.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }: {
-  home.pointerCursor = {
-    gtk.enable = true;
-    # x11.enable = true;
-    package = pkgs.catppuccin-cursors.macchiatoLavender;
-    name = "Catppuccin-Macchiato-Lavender-Cursors";
-    size = 32;
-  };
-
-  gtk.enable = true;
-}

home/hyprland/default.nix

@@ -1 +1 @@
-{ imports = [ ./hyprland.nix ./waybar.nix ./xdg.nix ./cursor.nix ]; }
+{ imports = [ ./hyprland.nix ./waybar.nix ./xdg.nix ]; }

home/hyprland/hyprland.nix

@@ -4,15 +4,13 @@
     home.packages = with pkgs; [
       cliphist
       dunst
-      # hyprlock
+      hyprlock
       hyprpaper
       rofi-wayland
       slurp
       swww
       waybar
       wl-clipboard
-      catppuccin-cursors.macchiatoLavender
-      bibata-cursors
     ];
 
     wayland.windowManager.hyprland = {
@@ -91,18 +89,14 @@
 
         bindr = [
           # mumble ptt release
-          # ",code:202,exec,mumble rpc stoptalking"
+          ",code:202,exec,mumble rpc stoptalking"
-          ",code:202,exec,pamixer --source 63 -m"
         ];
 
         bind = [
           # term
           "$mainMod,Return,exec,$term"
-
           # rofi
-          "$mainMod,D,exec,rofi-launcher"
+          "$mainMod,D,exec,rofi -show drun"
-          "$mainMod,P,exec,rofi-rbw"
-
           # hyprland
           "$mainMod,Q,killactive,"
           "CTRLALT,Delete,exit,"
@@ -125,8 +119,7 @@
           "$shiftMainMod,o,exec, hl-no-opacity"
 
           # mumble ptt click
-          # ",code:202,exec,mumble rpc starttalking"
+          ",code:202,exec,mumble rpc starttalking"
-          ",code:202,exec,pamixer --source 63 -u"
 
         ] ++ (builtins.concatLists (builtins.genList
           (x:
@@ -135,11 +128,12 @@
             in
             [
               "$mainMod, ${ws}, workspace, ${toString (x + 1)}"
+              "ALT, ${ws}, workspace, ${toString (x + 1)}"
             ]) 10));
         exec-once = [
           "waybar"
           "hyprpaper"
-          "easyeffects --gapplication-service"
+          "easy-effects --gapplication-service"
           # "dunst"
         ];
       };

home/i3/default.nix

@@ -1,32 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  mod = "Mod4";
-in
-{
-  xsession.windowManager.i3 = {
-    enable = true;
-    config = {
-      modifier = mod;
-
-      keybindings = lib.mkOptionDefault {
-        "${mod}+Enter" = "exec kitty";
-
-        # Focus
-        "${mod}+j" = "focus left";
-        "${mod}+k" = "focus down";
-        "${mod}+l" = "focus up";
-        "${mod}+semicolon" = "focus right";
-
-        # Move
-        "${mod}+Shift+j" = "move left";
-        "${mod}+Shift+k" = "move down";
-        "${mod}+Shift+l" = "move up";
-        "${mod}+Shift+semicolon" = "move right";
-
-        # My multi monitor setup
-        "${mod}+m" = "move workspace to output DP-2";
-        "${mod}+Shift+m" = "move workspace to output DP-5";
-      };
-    };
-  };
-}

home/packages/default.nix

@@ -11,18 +11,14 @@
     ffmpeg
     file
     go-task
-    glib
     jq
     kitty
-    kubectl
     ncdu
-    nwg-look
     mumble
     obs-studio
     pamixer
     pinentry
     pre-commit
-    pulseaudio
     pulsemixer
     rbw
     restic
@@ -30,12 +26,10 @@
     rofi-rbw-wayland
     spotify
     spicetify-cli
-    talosctl
 
-    # steam
+    steam
-    # steam-run
+    steam-run
-    # steamcmd
+    steamcmd
-    # gamescope
     tokei
     unzip
     yt-dlp

home/programs/rofi/config.rasi

@@ -1,17 +0,0 @@
-configuration{
-    modi: "run,drun,window";
-    icon-theme: "Oranchelo";
-    show-icons: true;
-    terminal: "alacritty";
-    drun-display-format: "{icon} {name}";
-    location: 0;
-    disable-history: false;
-    hide-scrollbar: true;
-    display-drun: "   Apps ";
-    display-run: "   Run ";
-    display-window: " 﩯  Window";
-    display-Network: " 󰤨  Network";
-    sidebar-mode: true;
-}
-
-@theme "latte"

home/programs/rofi/default.nix

@@ -1,24 +0,0 @@
-{ config, pkgs, ... }: {
-  xdg.configFile."rofi/config.rasi" = {
-    source = ./config.rasi;
-  };
-
-  xdg.configFile."rofi/macchiato.rasi" = {
-    source = pkgs.fetchFromGitHub
-      {
-        owner = "catppuccin";
-        repo = "rofi";
-        rev = "5350da41a11814f950c3354f090b90d4674a95ce";
-        sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
-      } + "/basic/.local/share/rofi/themes/catppuccin-macchiato.rasi";
-  };
-  xdg.configFile."rofi/latte.rasi" = {
-    source = pkgs.fetchFromGitHub
-      {
-        owner = "catppuccin";
-        repo = "rofi";
-        rev = "5350da41a11814f950c3354f090b90d4674a95ce";
-        sha256 = "DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
-      } + "/basic/.local/share/rofi/themes/catppuccin-latte.rasi";
-  };
-}

home/scripts/default.nix

@@ -3,8 +3,4 @@
     source = ./hl-no-opacity.sh;
     executable = true;
   };
-  home.file.".local/bin/rofi-launcher" = {
-    source = ./rofi-launcher.sh;
-    executable = true;
-  };
 }

home/scripts/rofi-launcher.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-rofi \
-    -show drun \
-    -modi run,drun,ssh \
-    -scroll-method 0 \
-    -drun-match-fields all \
-    -drun-display-format "{name}" \
-    -terminal kitty

hosts/gunter/configuration.nix

@@ -5,21 +5,16 @@
 
   # Bootloader stuff
   boot.kernelParams = [
-    "quiet"
+    # "quiet"
-    "splash"
+    # "splash"
-    "rd.systemd.show_status=false"
+    # "rd.systemd.show_status=false"
   ];
-
+  boot.loader.systemd-boot = { enable = true; };
-  boot.loader.systemd-boot = {
-    enable = true;
-    configurationLimit = 10;
-  };
-
   boot.loader.efi = { canTouchEfiVariables = true; };
 
-  # boot.extraModprobeConfig = ''
+  boot.extraModprobeConfig = ''
-  #   options nvidia NVreg_RegistryDwords="PowerMizerEnable=0x1; PerfLevelSrc=0x2222; PowerMizerLevel=0x3; PowerMizerDefault=0x3; PowerMizerDefaultAC=0x3"
+    options nvidia NVreg_RegistryDwords="PowerMizerEnable=0x1; PerfLevelSrc=0x2222; PowerMizerLevel=0x3; PowerMizerDefault=0x3; PowerMizerDefaultAC=0x3"
-  # '';
+  '';
 
   # Networking stuff
   networking.hostName = "gunter"; # Define your hostname.
@@ -47,7 +42,7 @@
     open = false;
     nvidiaSettings = true;
 
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 
   # Setup hyprland
@@ -62,8 +57,6 @@
   services.xserver.videoDrivers = [ "nvidia" ];
   services.xserver.displayManager.gdm.wayland = true;
   services.xserver.displayManager.lightdm.enable = false;
-  services.xserver.displayManager.startx.enable = true;
-  services.xserver.windowManager.i3.enable = true;
   programs.hyprland = {
     enable = true;
     xwayland.enable = true;
@@ -102,13 +95,6 @@
     usbutils
     vim
     wget
-
-    # X shit
-    # xorg.xorgserver
-    # xorg.xinit
-    # xorg.xf86inputevdev
-    # xorg.xf86inputlibinput
-    # xorg.xinit
   ];
 
   # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,

hosts/gunter/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
-    ./steamuser.nix
     ../../system
     ../../home
   ];

hosts/gunter/steamuser.nix

@@ -1,19 +0,0 @@
-{ pkgs, ... }: {
-  environment.shells = with pkgs; [ zsh ];
-
-  services.xserver.desktopManager.xfce.enable = true;
-  programs.steam.enable = true;
-
-  services.flatpak.enable = true;
-
-  users.users.steam = {
-    isNormalUser = true;
-    initialPassword = "steam";
-    home = "/home/steam";
-    description = "Steam user";
-    shell = pkgs.zsh;
-    # Install some user packages
-    packages = with pkgs; [
-    ];
-  };
-}