n8r/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update sway main machine to newest, fix deprecations, add gnome keyring

Browse Source
This commit is contained in:
Nathan Anderson 2025-12-12 21:55:49 -07:00
parent b4cecaff69
commit 67331242df
13 changed files with 36 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frame12/modules/niri/niri_conf.nix
View File

@ -105,7 +105,6 @@
enable = true;
terminal = "ghostty";
};
programs.file-roller.enable = true;
programs.xfconf.enable = true;
services.syncthing = {

1
nate-work/dotfiles/sway/config.d/autostart_applications
View File

@ -16,7 +16,6 @@ exec hash dbus-update-activation-environment 2>/dev/null && \
# exec python3 ~/.config/sway/scripts/swayfader.py
# gpu controller
exec corectrl
exec keepassxc
exec kdeconnect-indicator

1
nate-work/modules/home-manager/home.nix
View File

@ -187,7 +187,6 @@
};
};
};
};
# Better git diffs with delta
programs.delta = {

1
nate-work/modules/hypr/hyprland.nix
View File

@ -115,7 +115,6 @@ in
# thunar-volman
# ];
# };
# programs.file-roller.enable = true;
# For nautilus
services.gnome.sushi.enable = true;
programs.nautilus-open-any-terminal = {

3
nate-work/modules/sway/sway_conf.nix
View File

@ -102,7 +102,6 @@
thunar-volman
];
};
programs.file-roller.enable = true;
programs.xfconf.enable = true;
programs.zsh.enable = true;
@ -112,7 +111,7 @@
programs.adb.enable = true;
# programs.kdeconnect.enable = true;
# service file to start the sshAgent
programs.ssh.startAgent = true;
programs.ssh.startAgent = false; # using gnome keyring
###
## Services

60
nate/modules/home-manager/home.nix
View File

@ -70,6 +70,7 @@
# android-udev-rules
# android-tools
# sdkmanager
unstable.opencode
unstable.claude-code
#
@ -97,6 +98,7 @@
# Photo / Video
#
unstable.davinci-resolve-studio
obs-studio
# davinciDesktop
imv
mpv
@ -124,13 +126,6 @@
recursive
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
# home.file."${config.xdg.configHome}" = {
# source = ../../dotfiles;
# recursive = true;
# };
home.file = lib.mkMerge [
# Shared dotfiles
(let
@ -182,18 +177,17 @@
};
};
# For applying custom styles
# home.file.".mozilla/firefox/default" = {
# source = ../../misc/firefox_styles;
# recursive = true;
# };
# location where stylus data is kept
# /home/nate/.mozilla/firefox/default/storage/default/moz-extension+++77a1d59f-183c-4439-b249-fdae98b7bd7b/idb
services.kdeconnect = {
enable = true;
indicator = true;
};
# enable saving ssh secrets (needed for go mod installing private packages)
services.gnome-keyring.enable = true;
services.gnome-keyring.components = [ "ssh" "secrets" ];
# Enable bluetooth headphone controls
services.mpris-proxy.enable = true;
home.sessionVariables = {
# MANPAGER="sh -c 'col -bx | bat -l man -p'";
BAT_THEME="Catppuccin Macchiato";
@ -205,35 +199,46 @@
# Git setup
programs.git = {
enable = true;
userEmail = email;
userName = fullName;
extraConfig = {
include = { path = "${config.xdg.configHome}/macchiato.gitconfig"; };
settings = {
user.name = fullName;
user.email = email;
init = { defaultBranch = "main"; };
pull = { ff = "only"; };
merge = { conflictStyle="zdiff3"; };
pull = { ff = "only"; };
push = { autoSetupRemote="true"; };
delta = { features = "Catppuccin Macchiato"; };
# Vasion rewrite rule
url = {
"git@github.com:" = {
insteadOf = "https://github.com/";
};
};
};
delta.enable = true;
};
# Better git diffs with delta
programs.delta = {
enable = true;
enableGitIntegration = true;
options = {
side-by-side = true;
hyperlinks = true;
};
};
# direnv for auto nix flake shells
programs = {
direnv = {
enable = true;
enableZshIntegration = true; # see note on other shells below
enableZshIntegration = true;
nix-direnv.enable = true;
};
bash.enable = true; # see note on other shells below
bash.enable = true;
};
# Zsh setup
programs.zsh = {
enable = true;
oh-my-zsh = {
enable = true;
plugins = [ "git" "ssh-agent" ];
plugins = [ "git" ];
theme = "half-life";
extraConfig =
''
@ -241,6 +246,9 @@
'';
};
initContent = ''
# integrate ssh-agent from gnome keyring
export SSH_AUTH_SOCK=/run/user/$UID/gcr/ssh
eval "$(direnv hook zsh)"
yt-audio() {

7
nate/modules/sway/sway_conf.nix
View File

@ -101,7 +101,6 @@
enable = true;
terminal = "foot";
};
programs.file-roller.enable = true;
programs.xfconf.enable = true;
programs.zsh.enable = true;
@ -120,15 +119,11 @@
};
};
};
programs.corectrl = {
enable = true;
gpuOverclock.enable = true;
};
programs.adb.enable = true;
# programs.kdeconnect.enable = true;
# service file to start the sshAgent
programs.ssh.startAgent = true;
programs.ssh.startAgent = false; # using gnome keyring
###
## Services

1
nate/modules/user/main_user.nix
View File

@ -41,7 +41,6 @@ in
"adbusers"
"audio"
cfg.userName
"corectrl"
"dialout"
"docker"
"networkmanager"

1
scrappy/desktop-configuration.nix
View File

@ -148,7 +148,6 @@ in
thunar-volman
];
};
programs.file-roller.enable = true;
programs.xfconf.enable = true;
# sound.enable = false;
# services.xserver = {

1
scrappy/modules/home-manager/home.nix
View File

@ -191,7 +191,6 @@
### ---
# nur.repos.crazazy.js.eslint
# inputs.nixpkgs-stable.legacyPackages.x86_64-linux.corectrl
chromium
#
# Dev Tools

1
scrappy/modules/niri/niri_conf.nix
View File

@ -98,7 +98,6 @@
thunar-volman
];
};
programs.file-roller.enable = true;
programs.xfconf.enable = true;
programs.zsh.enable = true;

1
scrappy/modules/sway/sway_conf.nix
View File

@ -102,7 +102,6 @@
thunar-volman
];
};
programs.file-roller.enable = true;
programs.xfconf.enable = true;
programs.zsh.enable = true;

1
shared/modules/user/main_user.nix
View File

@ -40,7 +40,6 @@ in
extraGroups = [
"wheel"
"networkmanager"
"corectrl"
cfg.userName
"video"
"audio"