diff options
| -rw-r--r-- | flake.lock | 17 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | hosts/navi/default.nix | 32 | ||||
| -rw-r--r-- | hosts/vps/default.nix | 2 | ||||
| -rw-r--r-- | hosts/vps/services/git.nix | 51 | ||||
| -rw-r--r-- | mixins/cli.nix | 7 | ||||
| -rw-r--r-- | mixins/multimedia.nix | 1 | ||||
| -rw-r--r-- | mixins/sway.nix | 10 | ||||
| -rw-r--r-- | profiles/graphical.nix | 7 |
9 files changed, 94 insertions, 34 deletions
diff --git a/flake.lock b/flake.lock index 98b65f6..4dc22d2 100644 --- a/flake.lock +++ b/flake.lock @@ -243,6 +243,22 @@ "type": "github" } }, + "rizin-nixpkgs": { + "locked": { + "lastModified": 1691591679, + "narHash": "sha256-8ogXuB804eBXZIxJYPJ9EELzA/8Sp4VUbGfVfwybo/E=", + "owner": "chayleaf", + "repo": "nixpkgs", + "rev": "005275fa3703887cd4224b517bf37eb6676faee7", + "type": "github" + }, + "original": { + "owner": "chayleaf", + "ref": "rz-ghidra", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -254,6 +270,7 @@ "nix-index-database": "nix-index-database", "nixinate": "nixinate", "nixpkgs": "nixpkgs_2", + "rizin-nixpkgs": "rizin-nixpkgs", "viper-nix-common": "viper-nix-common" } }, diff --git a/flake.nix b/flake.nix index 8bb2930..4c23f51 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,7 @@ url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; + rizin-nixpkgs.url = "github:chayleaf/nixpkgs/rz-ghidra"; }; outputs = inputs @ {self, ...}: { diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix index 1bb573f..755d06b 100644 --- a/hosts/navi/default.nix +++ b/hosts/navi/default.nix @@ -89,7 +89,32 @@ }; home-manager.users.tzlil = { - home.packages = [pkgs.schildichat-desktop-wayland pkgs.keepassxc pkgs.gtkcord4]; + home.packages = [ + pkgs.schildichat-desktop-wayland + pkgs.keepassxc + pkgs.gtkcord4 + + (pkgs.stdenv.mkDerivation rec { + name = "pragmata"; + version = "1.0"; + src = ./pragmata; + + installPhase = '' + install -D ${src}/Pragmata_Pro_Bold_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Bold_Italic.otf + install -D ${src}/Pragmata_Pro_Bold.otf $out/share/fonts/opentype/Pragmata_Pro_Bold.otf + install -D ${src}/Pragmata_Pro_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Italic.otf + install -D ${src}/Pragmata_Pro_Mono_Bold_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Bold_Italic.otf + install -D ${src}/Pragmata_Pro_Mono_Bold.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Bold.otf + install -D ${src}/Pragmata_Pro_Mono_Italic.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Italic.otf + install -D ${src}/Pragmata_Pro_Mono_Regular.otf $out/share/fonts/opentype/Pragmata_Pro_Mono_Regular.otf + install -D ${src}/Pragmata_Pro_Regular.otf $out/share/fonts/opentype/Pragmata_Pro_Regular.otf + ''; + }) + + (inputs.rizin-nixpkgs.legacyPackages.${pkgs.system}.cutter.withPlugins (ps: with ps; [rz-ghidra sigdb])) + ]; + + programs.foot.settings.main.font = "Pragmata Pro Mono:size=20"; # programs.qutebrowser = { # enable = true; # settings.colors.webpage.darkmode.enabled = true; @@ -138,5 +163,10 @@ virtualisation.docker.enable = true; virtualisation.docker.storageDriver = "btrfs"; + + # pragmata + # home-manager.users.tzlil.home.packages = [ + + # ]; }; } diff --git a/hosts/vps/default.nix b/hosts/vps/default.nix index 87b195c..ba0fdb9 100644 --- a/hosts/vps/default.nix +++ b/hosts/vps/default.nix @@ -51,7 +51,7 @@ ]; services.terraria = { - enable = true; + enable = false; worldPath = "${config.services.terraria.dataDir}/14.wld"; password = "???"; openFirewall = true; diff --git a/hosts/vps/services/git.nix b/hosts/vps/services/git.nix index 7402a4b..2b6d0a2 100644 --- a/hosts/vps/services/git.nix +++ b/hosts/vps/services/git.nix @@ -3,7 +3,8 @@ config, ... }: { - config = { + config = let cgit = pkgs.cgit-pink; + in { users.groups.git = {}; users.users.git = { isSystemUser = true; @@ -36,43 +37,43 @@ bind 0.0.0.0 ${config.website.defaultHeaders} handle_path /cgit.png { - try_files ${pkgs.cgit}/cgit/cgit.png / + try_files ${cgit}/cgit/cgit.png / file_server } handle_path /cgit.css { try_files ${pkgs.fetchurl { - url = "https://jeremias.stotter.eu/cgi-bin/cgit.cgi/cgit-dark/plain/cgit.css"; - sha256 = "sha256-wqszujnWV5PRh3L23L1BFj/PKUElpyu1KhjqrHS8lCw="; - }} / + url = "https://jeremias.stotter.eu/cgi-bin/cgit.cgi/cgit-dark/plain/cgit.css"; + sha256 = "sha256-wqszujnWV5PRh3L23L1BFj/PKUElpyu1KhjqrHS8lCw="; + }} / file_server } handle_path /favicon.ico { - try_files ${pkgs.cgit}/cgit/favicon.ico / + try_files ${cgit}/cgit/favicon.ico / file_server } handle { reverse_proxy unix//run/fcgiwrap.sock { transport fastcgi { - env SCRIPT_FILENAME ${pkgs.cgit}/cgit/cgit.cgi + env SCRIPT_FILENAME ${cgit}/cgit/cgit.cgi env CGIT_CONFIG ${pkgs.writeText "cgitrc" (pkgs.lib.generators.toKeyValue {} { - css = "/cgit.css"; - logo = "/cgit.png"; - favicon = "/favicon.ico"; - clone-url = pkgs.lib.concatStringsSep " " [ - "http://git.tzlil.net/$CGIT_REPO_URL" - # "ssh://git@tzlil.net:$CGIT_REPO_URL" - ]; - enable-log-filecount = 1; - enable-log-linecount = 1; - enable-git-config = 1; - root-title = "tzlil.net"; - root-desc = "Tzlil's Git Repositories"; - scan-path = config.users.users.git.home; - about-filter = "${pkgs.cgit}/lib/cgit/filters/about-formatting.py"; - source-filter = "${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py"; - logo-link = "/"; - readme = ":README.md"; - })} + css = "/cgit.css"; + logo = "/cgit.png"; + favicon = "/favicon.ico"; + clone-url = pkgs.lib.concatStringsSep " " [ + "http://git.tzlil.net/$CGIT_REPO_URL" + # "ssh://git@tzlil.net:$CGIT_REPO_URL" + ]; + enable-log-filecount = 1; + enable-log-linecount = 1; + enable-git-config = 1; + root-title = "tzlil.net"; + root-desc = "Tzlil's Git Repositories"; + scan-path = config.users.users.git.home; + about-filter = "${cgit}/lib/cgit/filters/about-formatting.py"; + source-filter = "${cgit}/lib/cgit/filters/syntax-highlighting.py"; + logo-link = "/"; + readme = ":README.md"; + })} } } } diff --git a/mixins/cli.nix b/mixins/cli.nix index 6c784eb..abc2650 100644 --- a/mixins/cli.nix +++ b/mixins/cli.nix @@ -17,8 +17,12 @@ curl ripgrep bat + + # p2p file transfer croc + nix-output-monitor + # crap i need in my shell for general usage, mostly data science (pkgs.python3.withPackages (ps: with ps; [ @@ -66,6 +70,7 @@ enable = true; shellAliases = { gc = "git clone"; + gs = "git status"; l = "ls -alh"; b = "bat"; }; @@ -78,6 +83,8 @@ end nix shell $p ''; + tmp = "cd (mktemp -d --suffix -$argv[1])"; + py = ''python -c "print(eval(\"\"\"$argv\"\"\"))"''; # fish_command_not_found = "nix shell nixpkgs#(command-not-found $argv[1] &| sed -nr 's/.*-p (.*)$/\\1/p' | ${lib.getExe pkgs.fzf} || return 0) -c $argv[1]"; }; }; diff --git a/mixins/multimedia.nix b/mixins/multimedia.nix index 123037c..11a48d5 100644 --- a/mixins/multimedia.nix +++ b/mixins/multimedia.nix @@ -6,7 +6,6 @@ ... }: { home-manager.users.tzlil = { - fonts.fontconfig.enable = true; home.packages = with pkgs; [ ffmpeg gimp diff --git a/mixins/sway.nix b/mixins/sway.nix index 28e21d9..e588531 100644 --- a/mixins/sway.nix +++ b/mixins/sway.nix @@ -83,12 +83,12 @@ in { enable = true; server.enable = true; settings = { - # main = { - # term = "xterm-256color"; + main = { + # term = "xterm-256color"; - # font = "Fira Code:size=11"; - # dpi-aware = "yes"; - # }; + # font = "Fira Code:size=11"; + dpi-aware = "yes"; + }; colors = { background = "000000"; diff --git a/profiles/graphical.nix b/profiles/graphical.nix index 89c88f5..b284c0d 100644 --- a/profiles/graphical.nix +++ b/profiles/graphical.nix @@ -31,7 +31,12 @@ # name = "SolArc-Dark"; # package = pkgs.solarc-gtk-theme; # }; - # }; + # };=> + + qt = { + enable = true; + style.name = "adawita-dark"; + }; gtk = { theme.package = pkgs.gnome.gnome-themes-extra; |