diff --git a/configuration.nix b/configuration.nix index c559df1..f15ae57 100644 --- a/configuration.nix +++ b/configuration.nix @@ -56,60 +56,6 @@ in wantedBy = [ "multi-user.target" ]; }; - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # systemd.services.StartInputRemapperDaemonAtLogin = { - # enable = false; - # description = "Start input-remapper daemon after login"; - # unitConfig = { - # Type = "simple"; - # }; - # script = lib.getExe(pkgs.writeShellApplication { - # name = "start-input-mapper-daemon"; - # runtimeInputs = with pkgs; [input-remapper procps su]; - # text = '' - # until pgrep -u wayne; do - # sleep 1 - # done - # sleep 2 - # until [ $(pgrep -c -u root "input-remapper") -eq 4 ]; do - # input-remapper-service& - # sleep 1 - # input-remapper-helper& - # sleep 1 - # done - # su wayne -c "input-remapper-control --command stop-all" - # su wayne -c "input-remapper-control --command autoload" - # sleep infinity - # ''; - # }); - # wantedBy = [ "default.target" ]; - # }; - - # Possible weird bug - # systemd.services.ReloadInputRemapperAfterSleep = { - # enable = true; - # description = "Reload input-remapper config after sleep"; - # after = [ "suspend.target" ]; - # unitConfig = { - # Type = "forking"; - # }; - # serviceConfig.User = "wayne"; - # script = lib.getExe(pkgs.writeShellApplication { - # name = "reload-input-mapper-config"; - # runtimeInputs = with pkgs; [input-remapper ps gawk]; - # text = '' - # until [[ $(ps aux | awk '$11~"input-remapper" && $12="" {print $0}' | wc -l) -eq 0 ]]; do - # input-remapper-control --command stop-all - # input-remapper-control --command autoload - # sleep 1 - # done - # ''; - # }); - # wantedBy = [ "suspend.target" ]; - # }; - # Install firefox. programs.firefox.enable = true; programs.zsh.enable = true; @@ -190,12 +136,12 @@ in #media-session.enable = true; # wireplumber.enable = true; }; - # hardware.openrgb = { - # enable = false; - # package = pkgs.openrgb-with-all-plugins; - # motherboard = "intel"; - # server.port = 6742; - # }; + hardware.openrgb = { + enable = true; + package = pkgs.openrgb-with-all-plugins; + motherboard = "intel"; + server.port = 6742; + }; }; # List packages installed in system profile. To search, run: diff --git a/flake.nix b/flake.nix index 3cbdb5a..e9143f6 100644 --- a/flake.nix +++ b/flake.nix @@ -33,8 +33,6 @@ }; # Zen Browser - # zen-browser.url = "github:MarceColl/zen-browser-flake"; - # zen-browser.url = "github:mastermines1/zen-browser-flake"; zen-browser.url = "github:ch4og/zen-browser-flake"; # hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index f895ffb..a876c98 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -17,10 +17,6 @@ devices = [ "nodev" ]; efiSupport = true; useOSProber = true; - # extraConfig = '' - # set gfxmode=3840x2160 - # set gfxpayload=keep - # ''; }; }; diff --git a/hm/home.nix b/hm/home.nix index 6ba79f5..5fbdb4d 100644 --- a/hm/home.nix +++ b/hm/home.nix @@ -152,7 +152,6 @@ in nerdfonts ubuntu_font_family doublecmd filezilla - # pentablet-flake libreoffice unstablePkgs.bottles winePackages.wayland ] ++ (import ./pkgs { inherit unstablePkgs pkgs system zen-browser; }); diff --git a/hm/modules/wayland.nix b/hm/modules/wayland.nix index 2592ffa..90b7aa1 100644 --- a/hm/modules/wayland.nix +++ b/hm/modules/wayland.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { - # wayland.windowManager.hyprland.enable = true; - - wayland.windowManager = { + wayland.windowManager = { hyprland = { enable = true; systemd ={ @@ -14,52 +12,4 @@ xwayland.enable = true; }; }; - # systemd.user.services.keybase-kwallet = { - # # Move the description inside `Unit` to make it more explicit - # Unit = { - # Description = "Keybase startup after kwallet is open"; - # After = [ "graphical-session.target" ]; - # }; - - # # Define how the service should behave - # Service = { - # ExecStart = '' - # while ! dbus-send --session --type=method_call --dest=org.kde.KWallet /KWallet org.kde.KWallet.isOpen; do - # sleep 2 - # done - # # Run Keybase and other related services - # keybase unlock --no-prompt || keybase login - # kbfsfuse & - # keybase-gui & - # ''; - # Restart = "on-failure"; - # }; - - # # Make the service start on login - # Install = { - # WantedBy = [ "default.target" ]; - # }; - # }; - # systemd.user.services.input-remapper = { - # Unit = { - # description = "Custom Input Remapper Service"; - # }; - - # serviceConfig = { - # ExecStart = "${pkgs.input-remapper}/bin/input-remapper-control --config-dir /home/wayne/.config/input-remapper-2/ --device 'Hanvon Ugee Shortcut Remote' --preset 'Browsers' && ${pkgs.input-remapper}/bin/input-remapper-control --config-dir /home/wayne/.config/input-remapper-2/ --device 'MX MCHNCL Keyboard' --preset 'Layer_1' && ${pkgs.input-remapper}/bin/input-remapper-control --config-dir /home/wayne/.config/input-remapper-2/ --device 'SINO WEALTH Bluetooth Keyboard' --preset 'Layer_1'"; - # Restart = "on-failure"; - # }; - - # Install = { - # wantedBy = [ "graphical.target" ]; - # }; - # }; - - # home.file.".config/hypr/autostart-input-remapper.sh" = { - # text = '' - # #!/bin/sh - # sudo ${pkgs.input-remapper}/bin/input-remapper-service -d - # ''; - # executable = true; - # }; } \ No newline at end of file diff --git a/modules/containers.nix b/modules/containers.nix index e754b6d..0719121 100644 --- a/modules/containers.nix +++ b/modules/containers.nix @@ -258,19 +258,6 @@ ''; }; - - # imports = [ inputs.agenix.nixosModules.default ]; - - # age = { - # identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - # secrets."laravel" = { - # file = ../secrets/laravel.age; - # mode = "770"; - # owner = "laravel"; - # group = "laravel"; - # }; - # }; - services.nginx = { enable = false; package = pkgs.nginx; @@ -362,19 +349,6 @@ enableIPv6 = false; }; - - # imports = [ inputs.agenix.nixosModules.default ]; - - # age = { - # identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - # secrets."laravel" = { - # file = ../secrets/laravel.age; - # mode = "770"; - # owner = "laravel"; - # group = "laravel"; - # }; - # }; - services.nginx = { enable = false; package = pkgs.nginx; @@ -566,7 +540,6 @@ mailpit ]); - system.stateVersion = "24.05"; }; }; diff --git a/modules/security.nix b/modules/security.nix index 1d35fa1..b2f2da9 100644 --- a/modules/security.nix +++ b/modules/security.nix @@ -74,14 +74,6 @@ ''; }; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - age = { secrets = { nextcloud = { diff --git a/modules/wm.nix b/modules/wm.nix index f3f437d..685c954 100644 --- a/modules/wm.nix +++ b/modules/wm.nix @@ -9,30 +9,8 @@ variant = ""; }; videoDrivers = [ "nvidia" ]; - # xrandrHeads = { - # DP-6= { - # monitorConfig = '' - # DisplaySize 1920x1080 - # ''; - # }; - # DP-3 = { - # monitorConfig = '' - # DisplaySize 1920x1080 - # ''; - # }; - # DP-5 = { - # primary = true; - # monitorConfig = '' - # DisplaySize 3840x216 - # ''; - # }; - # }; }; - # services.xserver.displayManager.setupCommands = '' - # xrandr --output DP-4 --auto --primary - # ''; - services.displayManager = { defaultSession = "hyprland"; sddm = { @@ -49,7 +27,8 @@ enable = true; }; theme = "catppuccin-mocha"; - # package = pkgs.kdePackages.sddm; # Comment for plasma6 + # Sets logon screen + package = pkgs.kdePackages.sddm; # Comment for plasma6 }; }; }