From 8da40bac23908774b1f705d11f6582bcf09ff4cd Mon Sep 17 00:00:00 2001 From: joy Date: Sat, 23 Nov 2024 15:30:03 +0100 Subject: [PATCH] clean --- flake.nix | 2 +- modules/games/norisk/default.nix | 12 ++++++------ modules/hardware/lact/default.nix | 1 + modules/programs/bat/default.nix | 2 +- modules/programs/helix/default.nix | 18 ------------------ modules/programs/zsh/default.nix | 12 +++++------- modules/system/misc/default.nix | 1 - modules/wm/home/gtk/default.nix | 7 ++++++- modules/wm/home/misc/default.nix | 6 ------ modules/wm/home/rofi/default.nix | 2 +- modules/wm/hyprland/default.nix | 15 +++++++-------- 11 files changed, 28 insertions(+), 50 deletions(-) diff --git a/flake.nix b/flake.nix index 5be45b7..7bf9ba1 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ username = "joy"; domain = "joygnu.org"; mail = "mail@joygnu.org"; - nixpath = "nix/"; + nixpath = "~/nix"; pkgs-stable = nixpkgs-stable.legacyPackages.x86_64-linux; nixosconf = {modules}: diff --git a/modules/games/norisk/default.nix b/modules/games/norisk/default.nix index d0a59d5..2b6dd28 100644 --- a/modules/games/norisk/default.nix +++ b/modules/games/norisk/default.nix @@ -8,8 +8,8 @@ customPkgs = pkgs // { - noriskclient = pkgs.appimageTools.wrapType1 { - name = "noriskclient"; + no-risk-client = pkgs.appimageTools.wrapType1 { + name = "no-risk-client"; version = "0.5.13"; src = pkgs.fetchurl { @@ -23,14 +23,14 @@ in { config = lib.mkIf config.games.enable { environment.systemPackages = [ - customPkgs.noriskclient + customPkgs.no-risk-client ]; home-manager.users.${username}.xdg = { desktopEntries = { - NoRiskClient = { - name = "NoRisk Client"; - exec = "noriskclient"; + no-risk-client = { + name = "no-risk-client"; + exec = "no-risk-client"; icon = pkgs.fetchurl { url = iconurl; sha256 = iconsha256; diff --git a/modules/hardware/lact/default.nix b/modules/hardware/lact/default.nix index 73221ac..aa445ef 100644 --- a/modules/hardware/lact/default.nix +++ b/modules/hardware/lact/default.nix @@ -13,5 +13,6 @@ systemd.packages = with pkgs; [lact]; systemd.services.lactd.wantedBy = ["multi-user.target"]; hardware.amdgpu.initrd.enable = true; + hardware.graphics.enable = true; }; } diff --git a/modules/programs/bat/default.nix b/modules/programs/bat/default.nix index 0b696b4..4cb0b03 100644 --- a/modules/programs/bat/default.nix +++ b/modules/programs/bat/default.nix @@ -1,4 +1,4 @@ -{lib, ...}: { +{ programs.bat = { enable = true; }; diff --git a/modules/programs/helix/default.nix b/modules/programs/helix/default.nix index 791501d..9ff46b2 100644 --- a/modules/programs/helix/default.nix +++ b/modules/programs/helix/default.nix @@ -22,25 +22,7 @@ }; home.packages = with pkgs; [ - texlab - texliveFull nil - clang-tools - javascript-typescript-langserver - vscode-langservers-extracted - rust-analyzer - lldb_18 - lua-language-server - jdt-language-server - gopls - dockerfile-language-server-nodejs - python312Packages.python-lsp-server - omnisharp-roslyn - dotnetCorePackages.dotnet_8.sdk - go - marksman pandoc - multimarkdown - # md2pdf ]; } diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix index 94c8b97..67f80eb 100644 --- a/modules/programs/zsh/default.nix +++ b/modules/programs/zsh/default.nix @@ -17,19 +17,17 @@ shellAliases = { cn = "cd ~/nix"; ls = "${pkgs.eza}/bin/eza --icons -a --group-directories-first"; - v = "hx"; - cat = "bat"; + v = "${pkgs.helix}/bin/hx"; + cat = "${pkgs.bat}/bin/bat"; lg = "${pkgs.lazygit}/bin/lazygit"; rs = "z ~ && ssh root@45.145.42.193"; hs = "z ~ && ssh ${username}@${domain}"; su = "z ~ && su"; - ip = "sh ~/${nixpath}modules/programs/zsh/scripts/ip.sh"; - rb = "sh ~/${nixpath}modules/programs/zsh/scripts/rebuild.sh"; + ip = "sh ${nixpath}/modules/programs/zsh/scripts/ip.sh"; + rb = "sh ${nixpath}/modules/programs/zsh/scripts/rebuild.sh"; fr = "doas systemctl reboot --firmware"; - up = "nix flake update --flake ~/${nixpath}"; + up = "nix flake update --flake ${nixpath}"; del = "doas nix-collect-garbage -d"; - dn = "dotnet new console"; - dr = "dotnet run"; }; oh-my-zsh = { diff --git a/modules/system/misc/default.nix b/modules/system/misc/default.nix index c686f66..925984f 100644 --- a/modules/system/misc/default.nix +++ b/modules/system/misc/default.nix @@ -6,5 +6,4 @@ users.defaultUserShell = pkgs.zsh; services.xserver.excludePackages = [pkgs.xterm]; programs.nano.enable = false; - programs.java.enable = true; } diff --git a/modules/wm/home/gtk/default.nix b/modules/wm/home/gtk/default.nix index 47a0b26..972bcf2 100644 --- a/modules/wm/home/gtk/default.nix +++ b/modules/wm/home/gtk/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: let +{ + pkgs, + config, + ... +}: let gruvboxPlus = import ./gruvbox-plus.nix {inherit pkgs;}; in { home.file = { @@ -9,5 +13,6 @@ in { enable = true; iconTheme.package = gruvboxPlus; iconTheme.name = "GruvboxPlus"; + gtk2.configLocation = "${config.home.homeDirectory}/.config/gtk-2.0/gtkrc"; }; } diff --git a/modules/wm/home/misc/default.nix b/modules/wm/home/misc/default.nix index ee6985c..b970137 100644 --- a/modules/wm/home/misc/default.nix +++ b/modules/wm/home/misc/default.nix @@ -1,13 +1,9 @@ { pkgs, - config, lib, ... }: { home.packages = with pkgs; [ - hyprpicker - playerctl - rofimoji pwvucontrol pulseaudioFull sent @@ -19,7 +15,6 @@ boxbuddy ferdium drawio - distrobox obs-studio transmission_4-gtk gnome-clocks @@ -29,7 +24,6 @@ kdePackages.kdenlive sqlitebrowser ]; - gtk.gtk2.configLocation = "${config.home.homeDirectory}/.config/gtk-2.0/gtkrc"; xresources.path = ".config/.Xresources"; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ diff --git a/modules/wm/home/rofi/default.nix b/modules/wm/home/rofi/default.nix index 6bea850..45c4949 100644 --- a/modules/wm/home/rofi/default.nix +++ b/modules/wm/home/rofi/default.nix @@ -6,7 +6,7 @@ programs.rofi = { enable = true; package = pkgs.rofi-wayland; - theme = "~/${nixpath}modules/wm/home/rofi/gruvbox-material.rasi"; + theme = "${nixpath}/modules/wm/home/rofi/gruvbox-material.rasi"; extraConfig = { display-drun = ""; show-icons = true; diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index 648199b..abea712 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -13,7 +13,7 @@ enable = true; settings = { "$mod" = "SUPER"; - "$sciPath" = "~/${nixpath}modules/wm/hyprland/scripts"; + "$sciPath" = "${nixpath}/modules/wm/hyprland/scripts"; cursor = { inactive_timeout = "3"; }; @@ -81,14 +81,13 @@ "$mod, M, exec, mbsync -a && foot -e neomutt" "$mod, N, exec, foot -e newsboat" "$mod, A, exec, rofi -show drun" - "$mod, F, exec, freetube" - "$mod, C, exec, hyprpicker -a" - "$mod+Shift, Z, exec, grim - | swappy -f -" + "$mod, C, exec, ${pkgs.hyprpicker}/bin/hyprpicker -a" + "$mod+Shift, Z, exec, ${pkgs.grim}/bin/grim - | ${pkgs.swappy}/bin/swappy -f -" ''$mod,T, exec, ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - | ${pkgs.tesseract}/bin/tesseract - stdout -l deu --psm 6 | wl-copy'' ''$mod,Z, exec, ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - | ${pkgs.swappy}/bin/swappy -f -'' "$mod, V, exec, cliphist list | rofi show -dmenu | cliphist decode | wl-copy" "$mod, O, exec, sh $sciPath/mpv.sh" - "$mod, B, exec, rofimoji" + "$mod, B, exec, ${pkgs.rofimoji}/bin/rofimoji" "$mod, F, exec, foot -e hx" # controls "$mod, Q, killactive" @@ -103,9 +102,9 @@ "$mod, P, exec, hyprctl dispatch togglefloating && hyprctl dispatch resizeactive exact 854 480 && hyprctl dispatch movewindow d && hyprctl dispatch movewindow r && hyprctl dispatch pin" # cmus "$mod, D, exec, [float; pin; size 80% 80%;] sh $sciPath/cmus.sh" - "$mod, space, exec, playerctl play-pause" - "$mod, comma, exec, playerctl previous" - "$mod, period, exec, playerctl next" + "$mod, space, exec, ${pkgs.playerctl}/bin/playerctl play-pause" + "$mod, comma, exec, ${pkgs.playerctl}/bin/playerctl previous" + "$mod, period, exec, ${pkgs.playerctl}/bin/playerctl next" "$mod, equal, exec, cmus-remote -v +10%" "$mod, minus, exec, cmus-remote -v -10%" # Move focus