diff options
| -rw-r--r-- | flake.lock | 162 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | home-manager/home.nix | 43 | ||||
| -rw-r--r-- | modules/home-manager/bat.nix | 8 | ||||
| -rw-r--r-- | modules/nixos/cgit.nix | 15 | ||||
| -rw-r--r-- | modules/nixos/environment.nix | 3 |
6 files changed, 176 insertions, 59 deletions
@@ -19,11 +19,11 @@ "catppuccin-alacritty": { "flake": false, "locked": { - "lastModified": 1705368763, - "narHash": "sha256-ypYaxlsDjI++6YNcE+TxBSnlUXKKuAMmLQ4H74T/eLw=", + "lastModified": 1708974882, + "narHash": "sha256-HiIYxTlif5Lbl9BAvPsnXp8WAexL8YuohMDd/eCJVQ8=", "owner": "catppuccin", "repo": "alacritty", - "rev": "f2da554ee63690712274971dd9ce0217895f5ee0", + "rev": "071d73effddac392d5b9b8cd5b4b527a6cf289f9", "type": "github" }, "original": { @@ -35,11 +35,11 @@ "catppuccin-bat": { "flake": false, "locked": { - "lastModified": 1668065083, - "narHash": "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=", + "lastModified": 1710456315, + "narHash": "sha256-POoW2sEM6jiymbb+W/9DKIjDM1Buu1HAmrNP0yC2JPg=", "owner": "catppuccin", "repo": "bat", - "rev": "ba4d16880d63e656acced2b7d4e034e4a93f74b1", + "rev": "b19bea35a85a32294ac4732cad5b0dc6495bed32", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "catppuccin-helix": { "flake": false, "locked": { - "lastModified": 1697816303, - "narHash": "sha256-qEXhj/Mpm+aqThqEq5DlPJD8nsbPov9CNMgG9s4E02g=", + "lastModified": 1710265230, + "narHash": "sha256-ImrgF7xKD4gMBLI6m5CLChJEW82+nLJ2fVsPeZ58VVE=", "owner": "catppuccin", "repo": "helix", - "rev": "8313c7250fcbbb22c6680db332669073ec6b28c2", + "rev": "4bf31e995ead4e5f6e8cd4a08ea0497f1d35695b", "type": "github" }, "original": { @@ -133,22 +133,50 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1710257359, + "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { + "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang_2", "nixpkgs": [ "nixpkgs-unstable" ], - "systems": "systems", + "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1707176359, - "narHash": "sha256-h6BkgPOewfefG40E0KhEIqub207lUsfA84VfETb1m7c=", + "lastModified": 1710816831, + "narHash": "sha256-8PyLk/gfMo4asjbqsoXw1I3zfnkCPSSX0r6UCJP3ctw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ded174d6e5d14bc376919194cbc52c238a07f640", + "rev": "05c84304ccb1169b550504830139e07e28500a3b", "type": "github" }, "original": { @@ -186,16 +214,42 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", + "hyprcursor", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "nixpkgs": [ + "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", "type": "github" }, "original": { @@ -210,11 +264,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706637303, - "narHash": "sha256-K6SqE9diWDCoEQ+MzuVlTfNrAKcdIa/dLHBtKfz445U=", + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", "owner": "misterio77", "repo": "nix-colors", - "rev": "fc080c51d2a219b40d886870e364243783ed5ca1", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", "type": "github" }, "original": { @@ -225,11 +279,11 @@ }, "nixlib": { "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "lastModified": 1710636348, + "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c", "type": "github" }, "original": { @@ -246,11 +300,11 @@ ] }, "locked": { - "lastModified": 1706085261, - "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=", + "lastModified": 1710722910, + "narHash": "sha256-P5p9+WQFuABoBXBKEK1ZYu8mD6q8j/cQwZ9OYb0oh2E=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132", + "rev": "e63df01c798b99a76dc2ec25481be7dd25cd1610", "type": "github" }, "original": { @@ -261,11 +315,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706826059, - "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -292,11 +346,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { @@ -309,15 +363,15 @@ "nushell-scripts": { "flake": false, "locked": { - "lastModified": 1707136128, - "narHash": "sha256-OyQ4dMord891jClK/ucOAfATNlNSddLJENnrJYS5pXo=", - "owner": "nushell", + "lastModified": 1710829462, + "narHash": "sha256-RsyZL5TZjrLutcPxDy2jgC1kq6PN3CSwEczdzTXK5PU=", + "owner": "doolphin", "repo": "nu_scripts", - "rev": "14e77c7ec8479d210af230f75814e72efee7beb8", + "rev": "6bcf652c02465de388ec41706a8e58c940f2dc5b", "type": "github" }, "original": { - "owner": "nushell", + "owner": "doolphin", "repo": "nu_scripts", "type": "github" } @@ -355,6 +409,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "wallpapers": { "flake": false, "locked": { @@ -375,18 +444,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1706359063, - "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" } }, @@ -396,7 +465,10 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -407,11 +479,11 @@ ] }, "locked": { - "lastModified": 1706145785, - "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { @@ -49,7 +49,8 @@ # useful nushell scripts, such as auto_completion nushell-scripts = { - url = "github:nushell/nu_scripts"; + url = "github:doolphin/nu_scripts"; + # url = "github:nushell/nu_scripts"; flake = false; }; @@ -273,6 +274,7 @@ ./modules/nixos/nix-common.nix ./modules/nixos/environment.nix ./modules/nixos/tailscale.nix + ./modules/nixos/cgit.nix ./modules/nixos/system-packages.nix ./modules/users/defin.nix ./modules/users/root.nix diff --git a/home-manager/home.nix b/home-manager/home.nix index c526b40..73f99f9 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -56,6 +56,7 @@ yakuake pass btop + cava helvum filelight easyeffects @@ -146,14 +147,40 @@ loadAutoconfig = true; }; - ssh.matchBlocks = { - serverAliveCountMax = 6; - serverAliveInterval = 30; - port = 2200; - "git.wormcar.gay" = { - user = "devinf"; - host = "git.wormcar.gay"; - port = 2200; + ssh = { + matchBlocks = { + serverAliveCountMax = 6; + serverAliveInterval = 30; + port = 2200; + "doretta" = { + forwardAgent = true; + setEnv = { + EDITOR = "hx"; + }; + }; + "bosco" = { + forwardAgent = true; + setEnv = { + EDITOR = "hx"; + }; + }; + "zenbook" = { + forwardAgent = true; + setEnv = { + EDITOR = "hx"; + }; + }; + "khad" = { + forwardAgent = true; + setEnv = { + EDITOR = "hx"; + }; + }; + "git.wormcar.gay" = { + user = "devinf"; + host = "git.wormcar.gay"; + port = 2200; + }; }; }; diff --git a/modules/home-manager/bat.nix b/modules/home-manager/bat.nix index 978235c..13e8e6d 100644 --- a/modules/home-manager/bat.nix +++ b/modules/home-manager/bat.nix @@ -4,10 +4,10 @@ enable = true; config = { pager = "less -FR"; - theme = "catppuccin-mocha"; - }; - themes = { - catppuccin-mocha = builtins.readFile "${inputs.catppuccin-bat}/themes/Catppuccin mocha.tmTheme"; + # theme = "catppuccin-mocha"; }; + # themes = { + # catppuccin-mocha = builtins.readFile "${inputs.catppuccin-bat}/themes/Catppuccin Mocha.tmTheme"; + # }; }; } diff --git a/modules/nixos/cgit.nix b/modules/nixos/cgit.nix new file mode 100644 index 0000000..fc331ec --- /dev/null +++ b/modules/nixos/cgit.nix @@ -0,0 +1,15 @@ +{ ... } : { # This is for hosting on bosco + services.cgit = { + bosco-git = { + enable = true; + nginx.location = "/git/"; + nginx.virtualHost = "git.myrmexia.xyz"; + repos = { + nixos-flake = { + desc = "A public repo for viewing my nixos config."; + path = "/srv/git/.flake.git"; + }; + }; + }; + }; +} diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix index d76fcbc..52aaae9 100644 --- a/modules/nixos/environment.nix +++ b/modules/nixos/environment.nix @@ -6,7 +6,8 @@ # $ nix search wget sessionVariables = { NIXOS_OZONE_WL = "1"; - NIXPKGS_ALLOW_INSECURE="1"; + NIXPKGS_ALLOW_INSECURE = "1"; + RADV_PERFTEST = "rt"; }; variables = { # PATH = "/home/defin/.local/share/gem/ruby/3.0.0/bin:"; |