flake.nix

@@ -43,16 +43,7 @@
         magicman = nixpkgs.lib.nixosSystem {
           inherit system;
           specialArgs = { inherit inputs self user; };
-          modules = [
+          modules = [ ./hosts/magicman ];
-            ({ config, pkgs, ... }: {
-              nixpkgs.overlays = [
-                overlay-unstable
-                ghettoptt.overlays.default
-              ];
-            })
-            ./hosts/magicman
-            sops-nix.nixosModules.sops
-          ];
         };
         gunter = nixpkgs.lib.nixosSystem {
           inherit system;

home/hyprland/hypridle.conf

@@ -1,19 +0,0 @@
-general {
-    lock_cmd = hyprlock          # dbus/sysd lock command (loginctl lock-session)
-    # unlock_cmd = notify-send "unlock!"      # same as above, but unlock
-    before_sleep_cmd = hyprlock    # command ran before sleep
-    # after_sleep_cmd =   # command ran after sleep
-    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
-}
-
-listener {
-    timeout = 240                            # in seconds
-    on-timeout = hyprlock # command to run when timeout has passed
-    # on-resume = notify-send "Welcome back!"  # command to run when activity is detected after timeout has fired.
-}
-
-listener {
-    timeout = 900
-    on-timeout = systemctl suspend # command to run when timeout has passed
-    # on-resume = notify-send "Welcome back!"  # command to run when activity is detected after timeout has fired.
-}

home/hyprland/hypridle.nix

@@ -1,12 +0,0 @@
-{ config, pkgs, ... }: {
-
-  home.packages = with pkgs; [
-    unstable.hypridle
-  ];
-  xdg.configFile = {
-    "hypr/hypridle.conf" = {
-      source = config.lib.file.mkOutOfStoreSymlink ./. + "/hypridle.conf";
-      target = "hypr/hypridle.conf";
-    };
-  };
-}

home/hyprland/hyprland_magicman.nix

@@ -1,8 +1,4 @@
 { inputs, pkgs, lib, config, ... }: {
-  imports = [
-    ./hyprlock.nix
-    ./hypridle.nix
-  ];
   options.hyprland.enable = lib.mkEnableOption "Hyprland";
   config = {
     home.packages = with pkgs; [
@@ -31,7 +27,6 @@
         "$term" = "kitty";
 
         monitor = [
-          "eDP-1,1920x1080@60,0x0,1"
         ];
         input = {
           kb_layout = "no";
@@ -39,7 +34,11 @@
         };
 
         env = [
+          "LIBVA_DRIVER_NAME,nvidia"
           "XDG_SESSION_TYPE,wayland"
+          "GBM_BACKEND,nvidia-drm"
+          # "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+          "WLR_NO_HARDWARE_CURSORS,1"
         ];
 
         decoration = {
@@ -87,6 +86,11 @@
         ];
 
         workspace = [
+          "name:mumble, monitor:$mon_top, persistent:true, default:true"
+          "name:left, monitor:$mon_left, persistent:true, default:true"
+          "name:right, monitor:$mon_right, persistent:true, default:true"
+          "name:main 1, monitor:$mon_center, persistent:true, default:true"
+          "name:main 2, monitor:$mon_center, persistent:true, default:true"
         ];
 
         bindm = [
@@ -108,9 +112,6 @@
           "$mainMod,D,exec,rofi-launcher"
           "$mainMod,P,exec,rofi-rbw"
 
-          # hyprlock
-          "$shiftMainMod,l,exec,hyprlock"
-
           # hyprland
           "$mainMod,Q,killactive,"
           "CTRLALT,Delete,exit,"
@@ -136,11 +137,11 @@
           # ",code:202,exec,mumble rpc starttalking"
           #",code:202,pass,^(info\.mumble\.Mumble)$"
           # ",code:202,exec,pamixer --default-source -u"
-          # ",code:202,pass,^discord$"
+          ",code:202,pass,^discord$"
 
           # worspace switching
-          "$mainMod,1,workspace,1"
+          "$mainMod,1,workspace,name:main 1"
-          "$mainMod,2,workspace,2"
+          "$mainMod,2,workspace,name:main 2"
           "$mainMod,3,workspace,3"
           "$mainMod,4,workspace,4"
           "$mainMod,5,workspace,5"
@@ -150,7 +151,7 @@
         exec-once = [
           "waybar"
           "hyprpaper & sleep 2 && randomwp"
-          "hypridle"
+          "easyeffects --gapplication-service"
           # "dunst"
         ];
       };

home/hyprland/hyprlock.conf

@@ -1,78 +0,0 @@
-source = ~/.cache/wal/colors-hyprland.conf
-# BACKGROUND
-background {
-    monitor =
-    path = ~/wallpapers/current
-    blur_passes = 3
-    contrast = 0.8916
-    brightness = 0.8172
-    vibrancy = 0.1696
-    vibrancy_darkness = 0.0
-}
-
-# GENERAL
-general {
-    no_fade_in = false
-    grace = 0
-    disable_loading_bar = true
-}
-
-# INPUT FIELD
-input-field {
-    monitor =
-    size = 250, 60
-    outline_thickness = 2
-    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
-    dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
-    dots_center = true
-    outer_color = rgba(0, 0, 0, 0)
-    inner_color = rgba(0, 0, 0, 0.5)
-    font_color = rgb(200, 200, 200)
-    fade_on_empty = false
-    font_family = JetBrains Mono Nerd Font Mono
-    placeholder_text = <i><span foreground="##cdd6f4">Input Password...</span></i>
-    hide_input = false
-    position = 0, -120
-    halign = center
-    valign = center
-}
-
-# TIME
-label {
-    monitor =
-    text = cmd[update:1000] echo "$(date +"%b %d %H:%M")"
-    color = $foreground
-    #color = rgba(255, 255, 255, 0.6)
-    font_size = 120
-    font_family = JetBrains Mono Nerd Font Mono ExtraBold
-    position = 0, -300
-    halign = center
-    valign = top
-}
-
-## USER
-#label {
-#    monitor =
-#    text = Hi there, $USER
-#    color = $foreground
-#    #color = rgba(255, 255, 255, 0.6)
-#    font_size = 25
-#    font_family = JetBrains Mono Nerd Font Mono
-#    position = 0, -40
-#    halign = center
-#    valign = center
-#}
-
-# Battery level
-label {
-    monitor =
-    text = cmd[update:1000] echo "$(batlvl)" 
-    color = $foreground
-    #color = rgba(255, 255, 255, 0.6)
-    font_size = 18
-    # font_family = JetBrainsMono, Font Awesome 6 Free Solid
-    font_family = JetBrains Mono Nerd Font Mono
-    position = 0, -50
-    halign = center
-    valign = bottom
-}

home/hyprland/hyprlock.nix

@@ -1,12 +0,0 @@
-{ config, pkgs, ... }: {
-
-  home.packages = with pkgs; [
-    unstable.hyprlock
-  ];
-  xdg.configFile = {
-    "hypr/hyprlock.conf" = {
-      source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprlock.conf";
-      target = "hypr/hyprlock.conf";
-    };
-  };
-}

home/hyprland/magicman.nix

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

home/hyprland/waybar/default.nix

@@ -1,15 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, ... }: {
-let
-  flakestat = pkgs.writeShellApplication {
-    name = "flakestat";
-    runtimeInputs = with pkgs; [
-      git
-      jq
-    ];
-    text = builtins.readFile ./flakestat.sh;
-  };
-in
-{
   xdg.configFile."waybar/macchiato.css" = {
     source = pkgs.fetchFromGitHub
       {
@@ -107,7 +96,6 @@ in
       #network,
       #battery,
       #custom-powermenu,
-      #custom-flakestat,
       #custom-cava-internal {
         padding-left: 10px;
         padding-right: 10px;
@@ -155,7 +143,7 @@ in
       modules-left = [ "custom/launcher" "hyprland/workspaces" ];
       modules-center = [ "clock" ];
       modules-right =
-        [ "custom/flakestat" "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" "battery" ];
+        [ "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" ];
       "custom/launcher" = {
         "format" = " ";
         "on-click" = "pkill rofi || ~/.config/rofi/launcher.sh";
@@ -202,25 +190,6 @@ in
         "icon-size" = 15;
         "spacing" = 6;
       };
-      "battery" = {
-        "interval" = 60;
-        "states" = {
-          "warning" = 20;
-          "critical" = 5;
-        };
-        "format" = "{icon} {capacity}%";
-        "format-icons" = [
-          ""
-          ""
-          ""
-          ""
-          ""
-        ];
-      };
-      "custom/flakestat" = {
-        "exec" = "${flakestat}/bin/flakestat";
-        "interval" = 600;
-      };
     }];
   };
 }

home/hyprland/waybar/flakestat.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-FLAKE_DIR="/home/torjus/nixos"
-NIXPKGS_DIR="/home/torjus/git/nixpkgs"
-
-flake_metadata=$(nix flake metadata --json "$FLAKE_DIR" 2>/dev/null)
-
-stable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs.nixpkgs')
-stable_rev=$(echo "$flake_metadata" | jq -r ".locks.nodes.$stable_input.locked.rev")
-stable_branch=$(echo "$flake_metadata" | jq -r ".locks.nodes.$stable_input.original.ref")
-
-unstable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs."nixpkgs-unstable"')
-unstable_rev=$(echo "$flake_metadata" | jq -r ".locks.nodes.$unstable_input.locked.rev")
-unstable_branch=$(echo "$flake_metadata" | jq -r ".locks.nodes.$unstable_input.original.ref")
-
-cd "$NIXPKGS_DIR" || exit 1
-git fetch -q
-git switch -q "$stable_branch"
-git pull -q
-stable_commit_count=$(git rev-list "$stable_rev..HEAD"|wc -l)
-git switch -q "$unstable_branch"
-git pull -q
-unstable_commit_count=$(git rev-list "$unstable_rev..HEAD"|wc -l)
-
-echo "$stable_commit_count|$unstable_commit_count"

home/hyprland/waybar/waybar.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   programs.waybar = {
     enable = true;
     systemd = {
@@ -134,7 +133,7 @@
       modules-left = [ "custom/launcher" "hyprland/workspaces" ];
       modules-center = [ "clock" ];
       modules-right =
-        [ "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" "battery" ];
+        [ "pulseaudio" "pulseaudio#microphone" "memory" "cpu" "tray" ];
       "custom/launcher" = {
         "format" = " ";
         "on-click" = "pkill rofi || ~/.config/rofi/launcher.sh";
@@ -181,21 +180,6 @@
         "icon-size" = 15;
         "spacing" = 6;
       };
-      "battery" = {
-        "interval" = 60;
-        "states" = {
-          "warning" = 30;
-          "critical" = 5;
-        };
-        "format" = "{icon} {capacity}%";
-        "format-icons" = [
-          ""
-          ""
-          ""
-          ""
-          ""
-        ];
-      };
     }];
   };
 }

home/magicman.nix

@@ -16,9 +16,7 @@
         ./programs/rofi
         ./programs/obs-studio
         ./programs/vscode
-        ./programs/pywal
         ./scripts
-        ./scripts/batlvl.nix
         ./zsh
         ./packages
         ./hyprland/magicman.nix

home/packages/default.nix

@@ -10,10 +10,9 @@ in
     # Generic tools
     age
     alacritty
-    unstable.btop
+    (unstable.btop.override {
-    # (unstable.btop.override {
+      cudaSupport = true;
-    #   cudaSupport = true;
+    })
-    # })
     bzip2
     croc
     easyeffects
@@ -94,6 +93,7 @@ in
     unstable.blender
 
     # Homemade shit
+    notlistener
     ghettoptt
   ];
 }

home/programs/pywal/default.nix

@@ -1,27 +0,0 @@
-{ config, pkgs, ... }: {
-  programs.pywal.enable = true;
-
-  xdg.configFile = {
-    "wal/templates/colors-hyprland.conf" = {
-      text = ''$foreground = 0xff{foreground.strip}
-$background = 0xff{background.strip}
-$color0 = 0xff{color0.strip}
-$color1 = 0xff{color1.strip}
-$color2 = 0xff{color2.strip}
-$color3 = 0xff{color3.strip}
-$color4 = 0xff{color4.strip}
-$color5 = 0xff{color5.strip}
-$color6 = 0xff{color6.strip}
-$color7 = 0xff{color7.strip}
-$color8 = 0xff{color8.strip}
-$color9 = 0xff{color9.strip}
-$color10 = 0xff{color10.strip}
-$color11 = 0xff{color11.strip}
-$color12 = 0xff{color12.strip}
-$color13 = 0xff{color13.strip}
-$color14 = 0xff{color14.strip}
-$color15 = 0xff{color15.strip}
-      '';
-    };
-  };
-}

home/scripts/batlvl.nix

@@ -1,14 +0,0 @@
-{ config, pkgs, ... }:
-let
-  batlvl = pkgs.writeShellApplication {
-    name = "batlvl";
-    runtimeInputs = [
-    ];
-    text = builtins.readFile ./batlvl.sh;
-  };
-in
-{
-  home.packages = [
-    batlvl
-  ];
-}

home/scripts/batlvl.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-ac_status=$(cat /sys/class/power_supply/AC/online)
-bat_status=$(cat /sys/class/power_supply/BAT0/status)
-bat_lvl=$(cat /sys/class/power_supply/BAT0/capacity)
-if (("$ac_status" == 0)); then
-    echo "$bat_status - $bat_lvl%"
-else
-    if [ "$bat_lvl" -lt "90" ]; then
-        echo "$bat_status - $bat_lvl%"
-    fi
-fi

home/scripts/randomwp.sh

@@ -10,7 +10,7 @@ if ! [ -d "$WALLPAPER_DIR" ]; then
     exit 1
 fi
 
-wallpaper_path=$(find "$WALLPAPER_DIR" -mindepth 1 | grep png| sort -R | tail -n 1)
+wallpaper_path=$(find "$WALLPAPER_DIR" -mindepth 1 | sort -R | tail -n 1)
 
 if [ -z "$wallpaper_path" ]; then
     echo "Unable to find wallpaper"
@@ -26,13 +26,6 @@ echo "setting $wallpaper_path as wallpaper"
 hyprctl hyprpaper unload all
 hyprctl hyprpaper preload "$wallpaper_path"
 
-if command -v wal &> /dev/null; then
-    wal -i "$wallpaper_path"
-fi
-
-unlink "$WALLPAPER_DIR/current" || true
-ln -s "$wallpaper_path" "$WALLPAPER_DIR/current"
-
 for monitor in $(hyprctl monitors | grep 'Monitor' | awk '{ print $2 }'); do
     hyprctl hyprpaper wallpaper "$monitor,$wallpaper_path"
 done

hosts/magicman/configuration.nix

@@ -8,28 +8,10 @@
     "quiet"
     "splash"
     "rd.systemd.show_status=false"
-    "acpi_backlight=native"
-    "video=efifb:nobgrt"
-    "loglevel=3"
-    "rd.udev.log_level=3"
   ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   boot.loader.systemd-boot = { enable = true; };
   boot.loader.efi = { canTouchEfiVariables = true; };
 
-  boot.initrd.systemd.enable = true;
-  boot.plymouth = {
-    enable = true;
-    themePackages = with pkgs; [
-      catppuccin-plymouth
-    ];
-    theme = "catppuccin-macchiato";
-    extraConfig = ''
-      UseFirmwareBackground=false
-    '';
-  };
-
   # Networking stuff
   networking.hostName = "magicman"; # Define your hostname.
   networking.networkmanager.enable = true;
@@ -45,32 +27,19 @@
   hardware.opengl = {
     enable = true;
     extraPackages = with pkgs; [
-      intel-media-driver
+      # intel-media-driver
-      vaapiVdpau
+      # vaapiVdpau
-      libvdpau-va-gl
+      # libvdpau-va-gl
     ];
   };
 
   # Setup hyprland
   services.xserver.enable = true;
-  services.xserver.displayManager = {
+  # programs.hyprland = {
-    gdm.wayland = true;
+  #   enable = true;
-    lightdm.enable = false;
+  #   xwayland.enable = true;
-  };
+  #   portalPackage = pkgs.xdg-desktop-portal-hyprland;
-  programs.hyprland = {
+  # };
-    enable = true;
-    xwayland.enable = true;
-    portalPackage = pkgs.xdg-desktop-portal-hyprland;
-  };
-
-  # TRIM
-  services.fstrim.enable = true;
-
-  # TLP
-  services.tlp.enable = true;
-
-  # Brillo
-  hardware.brillo.enable = true;
 
   # Setup common XDG env vars
   environment.sessionVariables = rec {
@@ -87,13 +56,11 @@
     enable = true;
     xdgOpenUsePortal = true;
     extraPortals = (with pkgs; [
-      # xdg-desktop-portal-hyprland
+      xdg-desktop-portal-hyprland
       xdg-desktop-portal-gtk
     ]);
   };
 
-  programs.steam.enable = true;
-
   # Enable flakes
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nix.settings.trusted-users = [ "root" "torjus" ];

hosts/magicman/hardware-configuration.nix

@@ -1,44 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ "i915" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/31b20f4c-24bb-4fd1-9a3e-8ccc19fe3d64";
-      fsType = "xfs";
-    };
-
-  boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/4bbadd2c-94dd-4d80-94bf-9332d24b57bd";
-
-  fileSystems."/boot" =
-    {
-      device = "/dev/disk/by-uuid/7FF3-B061";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/6f2c4906-ad88-4d7e-88ec-61cdda41ce28"; }];
-
-  # 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
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

system/users.nix

@@ -12,7 +12,7 @@
     home = "/home/torjus";
     description = "Torjus";
     shell = pkgs.zsh;
-    extraGroups = [ "wheel" "input" "networkmanager" "video" ];
+    extraGroups = [ "wheel" "input" "networkmanager" ];
     # Install some user packages
     packages = with pkgs; [
     ];