pagedmov/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes 08-09-25

Browse Source
This commit is contained in:
pagedmov
2025-08-09 23:20:12 -04:00
parent 4e44a1618b
commit 09302c1562
22 changed files with 145 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
flake.lock generated
View File

@@ -272,11 +272,11 @@
]
},
"locked": {
"lastModified": 1753809622,
"narHash": "sha256-66G3qmbOUJJEaxvH97S7I467ILMUV2nTkkRuoN/ZQq4=",
"lastModified": 1753983724,
"narHash": "sha256-2vlAOJv4lBrE+P1uOGhZ1symyjXTRdn/mz0tZ6faQcg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "03fdb31290d1a4a8d23f52206283450d304c3841",
"rev": "7035020a507ed616e2b20c61491ae3eaa8e5462c",
"type": "github"
},
"original": {
@@ -377,11 +377,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1753804949,
"narHash": "sha256-WWUeMJs7kAIK1ZVqHf2acI6LV2U5X2Vbwql8qnnzif8=",
"lastModified": 1753978079,
"narHash": "sha256-9VhQ8igwVxPonlMDwpkAyrcvIQ4FgR/LQF7NWl2YR4Q=",
"ref": "refs/heads/main",
"rev": "f51be7f20109cd8eae87db96641aead843a3ef0b",
"revCount": 6321,
"rev": "9607e3b5a88f22017af64ab1ba360a39169a4bf7",
"revCount": 6330,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -547,11 +547,11 @@
]
},
"locked": {
"lastModified": 1752252310,
"narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=",
"lastModified": 1753800567,
"narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82",
"rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7",
"type": "github"
},
"original": {
@@ -744,6 +744,22 @@
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1754393734,
"narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a683adc19ff5228af548c6539dbc3440509bfed3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1751792365,
"narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
@@ -762,18 +778,16 @@
"nixvim": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs_6",
"nuschtosSearch": "nuschtosSearch",
"systems": "systems_4"
},
"locked": {
"lastModified": 1753805595,
"narHash": "sha256-5m0FqObrj/0/nfoaKlgpye4+SZzj1nMPnlxGxlIxKNg=",
"lastModified": 1753977315,
"narHash": "sha256-AM3CZh+Emk/cr5Gf6RUf2xzkWdRB+yewP1YWoRxUbYQ=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "fe0bcc92c8c593d5e2b45ffb0d1253c3aa55eb72",
"rev": "a16c89c175277309fd3dd065fb5bc4eab450ae07",
"type": "github"
},
"original": {
@@ -896,7 +910,7 @@
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_2",
"gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"nur": "nur",
"systems": "systems_6",
"tinted-foot": "tinted-foot",
@@ -906,11 +920,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1753731630,
"narHash": "sha256-8pyTksY2aYtLGmqP8u3xhs4ZfttsfzZXAQZXHKecLDo=",
"lastModified": 1753978157,
"narHash": "sha256-sVy8hb71VawSOIsLv/hMGzpvbbWszdP9aSKI5Drbt6Q=",
"owner": "danth",
"repo": "stylix",
"rev": "57d036d92283fddc6ae080459e72e767144a1cda",
"rev": "ded4f29a023e0f14506ec16b0e32d129e56341cc",
"type": "github"
},
"original": {

5
flake.nix
View File

@@ -8,10 +8,7 @@
stylix.url = "github:danth/stylix";
disko.url = "github:nix-community/disko";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim.url = "github:nix-community/nixvim";
home-manager = {
url = "github:nix-community/home-manager";

1
hosts/work/config.nix
View File

@@ -45,6 +45,7 @@
};
};
};
security.polkit.enable = true;
security.sudo.extraConfig = ''
${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/${username}/bin/rebuild
'';

3
modules/home/environment/userpkgs.nix
View File

@@ -10,6 +10,7 @@ let
myScripts.viconf
myScripts.vipkg
myScripts.fetchfromgh
myScripts.mkshell
myScripts.garbage-collect
myScripts.rebuild
myScripts.chpaper
@@ -59,6 +60,7 @@ in {
rustup
w3m
neovide
claude-code
python3
ghostty
firefox
@@ -70,6 +72,7 @@ in {
discord
cloc
wine
nerd-fonts.fira-code
nodejs_latest
] ++ scripts;
};

22
modules/home/environment/zsh/extraconfig.nix
View File

@@ -21,13 +21,6 @@ in
export RESULT
echo "\$RESULT = $RESULT"
}
precmd() { # Reset kitty color scheme
if [ "$NIX_SHELL" = "false" ]; then # don't run this in a nix-shell
trap 'NIX_SHELL=false kitty_theme' EXIT SIGINT SIGTERM SIGHUP
else # but still apply ssh theme logic in nix-shell
trap 'kitty_theme' EXIT SIGINT SIGTERM SIGHUP
fi
}
nix-shell() {
NIX_SHELL=true command nix-shell "$@" --run zsh
}
@@ -55,17 +48,6 @@ in
command neovide "$@"
}
alias vi="nvim"
kitty_theme() {
if [ $TERM = "xterm-kitty" ]; then
if [ -n "$SSH_CONNECTION" ]; then
kitty @ set-colors -a ~/.config/kitty/ssh-theme.conf
elif [ "$name" = "nix-shell-env" ] || [ "$NIX_SHELL" = "true" ]; then
kitty @ set-colors -a ~/.config/kitty/nix-shell-theme.conf
else
kitty @ set-colors -a ~/.config/kitty/default-theme.conf
fi
fi
}
grimblast() {
if command grimblast "$@"; then
${shellsound} ${sndpath}/screenshot.wav
@@ -145,9 +127,10 @@ in
eza -1 --group-directories-first --icons "$@"
SOUNDS_ENABLED=$prev_sounds_enabled
builtin cd "$@"
${shellsound} /nix/store/7a9w7np3qrvmzxjbs7xj05qq2yccgfsj-source/assets/sound/cd.wav
${shellsound} ${sndpath}/cd.wav
return 0
}
if [ ! -e $HOME/.zsh_history ]; then
touch $HOME/.zsh_history
chmod 600 $HOME/.zsh_history
@@ -191,7 +174,6 @@ in
source ${fzf-tab}/fzf-tab.plugin.zsh
bindkey -v
kitty_theme
type starship_zle-keymap-select >/dev/null || \
{
eval "$(starship init zsh)"

7
modules/home/programs/nixvim/default.nix
View File

@@ -1,9 +1,14 @@
{ env, config, pkgs, host, self, ... }: {
programs.nixvim.extraPackages = [
programs.nixvim = {
nixpkgs.useGlobalPackages = true;
extraPackages = [
pkgs.cargo
pkgs.rustc
pkgs.clippy
pkgs.rustup
pkgs.rust-analyzer
pkgs.nerd-fonts.envy-code-r
];
};
imports = [ ./plugins ./options.nix ./keymaps.nix ./autocmd.nix ];
}

2
modules/home/programs/nixvim/options.nix
View File

@@ -56,7 +56,7 @@ in {
vim.opt.linebreak = true
vim.opt.textwidth = 0
vim.opt.breakat = " \t!@*-+;:,./?"
vim.opt.guifont = "Fira Code:h18"
vim.opt.guifont = "EnvyCodeR Nerd Font Mono:h18"
vim.g.mapleader = "!"
vim.g.rust_recommended_style = 0

8
modules/home/programs/nixvim/plugins/claudecode.nix Normal file
View File

@@ -0,0 +1,8 @@
{
programs.nixvim.plugins = {
claude-code = {
enable = true;
autoLoad = true;
};
};
}

1
modules/home/programs/nixvim/plugins/default.nix
View File

@@ -17,6 +17,7 @@
./nvim-lightbulb.nix
./neocord.nix
./copilot.nix
./claudecode.nix
./plugins.nix
./nvim-tree.nix
./telescope.nix

5
modules/home/programs/nixvim/plugins/lsp.nix
View File

@@ -82,7 +82,10 @@
installCargo = false;
installRustc = false;
settings = {
check.allTargets = false;
check = {
allTargets = false;
command = "clippy";
};
};
};
nixd = {

7
modules/home/programs/nixvim/plugins/rustaceanvim.nix
View File

@@ -4,7 +4,12 @@
programs.nixvim.plugins.rustaceanvim = {
enable = false;
settings = {
server.auto_attach = true;
server = {
auto_attach = true;
default_settings = {
checkOnSave.command = "clippy";
};
};
dap.adapter = false;
};
};

1
modules/sys/hardware/network.nix
View File

@@ -16,6 +16,7 @@
firewall = {
enable = true;
allowedTCPPorts = [ 443 8080 ];
trustedInterfaces = [ "vnet9" "virbr0" "enp0s2" ];
};
};
};

1
modules/sys/software/gaming/gaming_pkgs.nix
View File

@@ -22,6 +22,7 @@ in {
#snes9x-gtk
#cust-openrct2
mgba
shadps4
cust-prismlauncher
];
};

6
modules/sys/software/virtualization.nix
View File

@@ -1,4 +1,4 @@
{ lib, config, username, ... }: {
{ lib, config, username, pkgs, ... }: {
options = {
movOpts.softwareCfg.virtConfig.enable =
lib.mkEnableOption "enables virtualization";
@@ -6,5 +6,9 @@
config = lib.mkIf config.movOpts.softwareCfg.virtConfig.enable {
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
environment.systemPackages = with pkgs; [
spice-gtk
usbredir
];
};
}

26
overlay/overlay.nix
View File

@@ -23,29 +23,5 @@ in
slash = super.callPackage ./pkgs/slash/package.nix {};
fzf-tab = super.callPackage ./pkgs/zsh-fzf-tab/package.nix {};
};
myScripts = {
# Scripts written using pkgs.writeShellApplication
icanhazip = super.callPackage ./scripts/commands/icanhazip.nix {};
invoke = super.callPackage ./scripts/commands/invoke.nix { self = root; };
git-compose = super.callPackage ./scripts/commands/git-compose.nix { self = root; };
runbg = super.callPackage ./scripts/commands/runbg.nix {};
splash = super.callPackage ./scripts/commands/splash.nix {};
toolbelt = super.callPackage ./scripts/commands/toolbelt.nix {};
viconf = super.callPackage ./scripts/commands/viconf.nix {};
vipkg = super.callPackage ./scripts/commands/vipkg.nix {};
fetchfromgh = super.callPackage ./scripts/nix/fetchfromgh.nix {};
garbage-collect = super.callPackage ./scripts/nix/garbage-collect.nix {};
check_updates = super.callPackage ./scripts/nix/check_updates.nix {};
rebuild = super.callPackage ./scripts/nix/rebuild.nix { inherit host; self = root; };
chpaper = super.callPackage ./scripts/wm-controls/chpaper.nix {};
chscheme = super.callPackage ./scripts/wm-controls/chscheme.nix {};
keyring = super.callPackage ./scripts/wm-controls/keyring.nix {};
playshellsound = super.callPackage ./scripts/wm-controls/playshellsound.nix {};
mkscreenshots = super.callPackage ./scripts/wm-controls/mkscreenshots.nix {};
moveonscreen = super.callPackage ./scripts/wm-controls/moveonscreen.nix {};
s_check = super.callPackage ./scripts/wm-controls/s_check.nix {};
switchmon = super.callPackage ./scripts/wm-controls/switchmon.nix {};
color-commit = super.callPackage ./scripts/misc/color-commit.nix {};
mntstack = super.callPackage ./scripts/misc/mntstack.nix {};
};
myScripts = import ./scripts { inherit super root host; };
}

12
overlay/scripts/commands/default.nix Normal file
View File

@@ -0,0 +1,12 @@
{ super, root }:
{
icanhazip = super.callPackage ./icanhazip.nix {};
invoke = super.callPackage ./invoke.nix { self = root; };
git-compose = super.callPackage ./git-compose.nix { self = root; };
runbg = super.callPackage ./runbg.nix {};
splash = super.callPackage ./splash.nix {};
toolbelt = super.callPackage ./toolbelt.nix {};
viconf = super.callPackage ./viconf.nix {};
vipkg = super.callPackage ./vipkg.nix {};
}

7
overlay/scripts/default.nix Normal file
View File

@@ -0,0 +1,7 @@
{ super, root, host }:
# We need to fold all of these into a single attribute set
import ./commands { inherit super root; } //
import ./nix { inherit super host root; } //
import ./misc { inherit super; } //
import ./wm-controls { inherit super; }

6
overlay/scripts/misc/default.nix Normal file
View File

@@ -0,0 +1,6 @@
{ super }:
{
color-commit = super.callPackage ./color-commit.nix {};
mntstack = super.callPackage ./mntstack.nix {};
}

9
overlay/scripts/nix/default.nix Normal file
View File

@@ -0,0 +1,9 @@
{ super, host, root }:
{
fetchfromgh = super.callPackage ./templates/fetchfromgh.nix {};
mkshell = super.callPackage ./templates/mkshell.nix {};
garbage-collect = super.callPackage ./garbage-collect.nix {};
check_updates = super.callPackage ./check_updates.nix {};
rebuild = super.callPackage ./rebuild.nix { inherit host; self = root; };
}

0
overlay/scripts/nix/fetchfromgh.nix → overlay/scripts/nix/templates/fetchfromgh.nix
View File

19
overlay/scripts/nix/templates/mkshell.nix Normal file
View File

@@ -0,0 +1,19 @@
{ pkgs ? import <nixpkgs> { } }:
pkgs.writeShellApplication {
name = "mkshell";
runtimeInputs = [];
text = ''
command cat <<EOF
devShells.\''${system}.default = pkgs.mkShell {
buildInputs = with pkgs; [
];
shellHook = '''
export SHELL=\''${pkgs.zsh}/bin/zsh
exec \''${pkgs.zsh}/bin/zsh
''';
};
EOF
'';
}

12
overlay/scripts/wm-controls/default.nix Normal file
View File

@@ -0,0 +1,12 @@
{ super }:
{
chpaper = super.callPackage ./chpaper.nix {};
chscheme = super.callPackage ./chscheme.nix {};
keyring = super.callPackage ./keyring.nix {};
playshellsound = super.callPackage ./playshellsound.nix {};
mkscreenshots = super.callPackage ./mkscreenshots.nix {};
moveonscreen = super.callPackage ./moveonscreen.nix {};
s_check = super.callPackage ./s_check.nix {};
switchmon = super.callPackage ./switchmon.nix {};
}