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

remove home-manager and some old files

Browse Source
This commit is contained in:
Liam Malone
2026-04-20 00:08:47 +01:00
parent 7ed11cbb54
commit 67a1e0ced0
25 changed files with 194 additions and 1393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/darp8/configuration.nix
+3 -10
View File
@@ -4,7 +4,9 @@
imports = [
./hardware-configuration.nix
../graphical/configuration.nix
inputs.home-manager.nixosModules.default
./file.nix
./pkgs.nix
./services.nix
];
networking.hostName = "darp8";
@@ -60,15 +62,6 @@
};
};
home-manager = {
useGlobalPkgs = true;
extraSpecialArgs = { inherit inputs; inherit cfg; };
users = {
"${cfg.username}" = import ./home.nix;
};
backupFileExtension = ".bak";
};
# This option defines the first version of NixOS you have installed on this particular machine
# Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
# and migrated your data accordingly.
hosts/darp8/file.nix
+2 -8
View File
@@ -1,22 +1,16 @@
{ cfg, config, context, pkgs, ... }:
let
inherit (config.home) username homeDirectory;
mkSymlinkAttrs = import ../../utils/mkSymlinkAttrs.nix {
inherit pkgs;
inherit (cfg) context runtimeRoot;
hm = config.lib; # same as: cfg.context.inputs.home-manager.lib.hm;
};
in
{
imports = [
../graphical/file.nix # import shared configs
];
imports = [ ../graphical/file.nix ];
# Symlink per-host dotfiles
home.file = mkSymlinkAttrs {
systemd.user.tmpfiles.rules = mkSymlinkAttrs {
".config/hypr/hypr-monitors.conf" = {
source = ../../configs/hypr-darp8/hypr-monitors.conf;
outOfStoreSymlink = true;
hosts/darp8/pkgs.nix
+1 -5
View File
@@ -9,15 +9,11 @@
];
# BEGIN PER-HOST PACKAGES
home.packages = with pkgs; [
users.users.liamm.packages = with pkgs; [
android-studio
genymotion
praat
mcpelauncher-ui-qt
];
# BEGIN PER-HOST PROGRAMS
programs = {
};
}
hosts/desktop/configuration.nix
+3 -10
View File
@@ -4,7 +4,9 @@
imports = [
./hardware-configuration.nix
../graphical/configuration.nix
inputs.home-manager.nixosModules.default
./file.nix
./pkgs.nix
./services.nix
];
networking.hostName = "lmdesktop";
@@ -47,15 +49,6 @@
};
};
home-manager = {
useGlobalPkgs = true;
extraSpecialArgs = { inherit inputs; inherit cfg; };
users = {
"${cfg.username}" = import ./home.nix;
};
backupFileExtension = ".bak";
};
# This option defines the first version of NixOS you have installed on this particular machine
# Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
# and migrated your data accordingly.
hosts/desktop/file.nix
+2 -7
View File
@@ -1,22 +1,17 @@
{ cfg, config, context, pkgs, ... }:
let
inherit (config.home) username homeDirectory;
mkSymlinkAttrs = import ../../utils/mkSymlinkAttrs.nix {
inherit pkgs;
inherit (cfg) context runtimeRoot;
hm = config.lib; # same as: cfg.context.inputs.home-manager.lib.hm;
};
in
{
imports = [
../graphical/file.nix # import shared configs
];
imports = [ ../graphical/file.nix ];
# Symlink per-host ddtfiles
home.file = mkSymlinkAttrs {
systemd.user.tmpfiles.rules = mkSymlinkAttrs {
".config/hypr/hypr-monitors.conf" = {
source = ../../configs/hypr-desktop/hypr-monitors.conf;
outOfStoreSymlink = true;
hosts/desktop/pkgs.nix
+1 -5
View File
@@ -9,7 +9,7 @@
];
# BEGIN PER-HOST PACKAGES
home.packages = with pkgs; [
users.users.liamm.packages = with pkgs; [
android-studio
genymotion
fred
@@ -19,9 +19,5 @@
shotcut
nvtopPackages.nvidia
];
# BEGIN PER-HOST PROGRAMS
programs = {
};
}
hosts/graphical/configuration.nix
+30 -46
View File
@@ -2,6 +2,7 @@
{
imports = [
inputs.dms.nixosModules.greeter
inputs.dms.nixosModules.dank-material-shell
];
boot = {
@@ -47,25 +48,6 @@
};
services = {
# for iphone screencasting
# avahi = {
# enable = true;
# nssmdns4 = true;
# publish = {
# enable = true;
# userServices = true;
# };
# };
# greetd = {
# enable = true;
# restart = true;
# # settings = {
# # default_session = {
# # command = "${pkgs.tuigreet}/bin/tuigreet --cmd start-hyprland";
# # };
# # };
# };
displayManager.dms-greeter = {
enable = true;
compositor.name = "hyprland";
@@ -73,6 +55,9 @@
package = inputs.dms.packages.${pkgs.stdenv.hostPlatform.system}.default;
};
gnome.gnome-keyring.enable = true;
libinput.enable = true;
blueman.enable = true;
gvfs.enable = true;
@@ -82,13 +67,7 @@
};
security.pam.services.hyprlock = {};
# environment = {
# etc = {
# "greetd/environments".text = ''
# Hyprland
# '';
# };
# };
security.pam.services.login.enableGnomeKeyring = true;
fonts = {
packages = with pkgs; [
@@ -96,12 +75,7 @@
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-color-emoji
# liberation_ttf
# fira-code-symbols
mplus-outline-fonts.githubRelease
# dina-font
# nerd-fonts.fira-code
# nerd-fonts.droid-sans-mono
];
fontconfig = {
@@ -137,6 +111,21 @@
};
programs = {
bash = {
completion.enable = true;
promptInit = ''
if [[ -z $ORIG_SHLVL ]]; then
export ORIG_SHLVL=$SHLVL
fi
if [[ $SHLVL -gt $ORIG_SHLVL ]]; then
export PS1='\[\e[1;m\e[1;33m\e[1;m\] ($(($SHLVL - $ORIG_SHLVL))) \W\[\e[m\e[m\] 🐧 \[\e[1;32m\]~> \[\e[m\e[m\]'
else
export PS1='\[\e[1;m\e[1;33m\e[1;m\] \W\[\e[m\e[m\] 🐧 \[\e[1;32m\]~> \[\e[m\e[m\]'
fi
'';
};
steam = {
enable = true;
remotePlay.openFirewall = true;
@@ -152,15 +141,9 @@
plugins = [ ];
};
# dank-material-shell.greeter = {
# enable = true;
# compositor.name = "hyprland";
# configHome = "${cfg.homeDirectory}";
# };
# river-classic = {
# enable = true;
# xwayland.enable = true;
# };
dank-material-shell = {
enable = true;
};
gnupg.agent = {
enable = true;
@@ -180,11 +163,11 @@
mtr.enable = true;
};
# maybe delete?
lib.inputMethod.fcitx5.waylandFrontend = true;
environment.systemPackages = with pkgs; [
bat
# bolt
discord
fd
file
@@ -196,13 +179,9 @@
libnotify
mesa
neovim
# qmk
ripgrep
spotify
unzip
# usbutils
# uxplay
# vial
vim
waypipe
wget
@@ -211,7 +190,12 @@
zip
];
environment.sessionVariables = {};
environment.sessionVariables = {
EDITOR = "focus";
GIT_EDITOR = "nvim";
NIX_SHELL_PRESERVE_PROMPT = "1";
NIX_CONFIG_DIR = "/home/liamm/nixos";
};
zramSwap = {
enable = true;
hosts/graphical/file.nix
+17 -5
View File
@@ -1,18 +1,14 @@
{ cfg, config, context, pkgs, ... }:
let
inherit (config.home) username homeDirectory;
mkSymlinkAttrs = import ../../utils/mkSymlinkAttrs.nix {
inherit pkgs;
inherit (cfg) context runtimeRoot;
hm = config.lib; # same as: cfg.context.inputs.home-manager.lib.hm;
};
in
{
# Symlink shared dotfiles
home.file = mkSymlinkAttrs {
systemd.user.tmpfiles.rules = mkSymlinkAttrs {
# Fonts
".local/share/fonts" = {
source = ../../fonts;
@@ -76,6 +72,12 @@ in
outOfStoreSymlink = true;
recursive = true;
};
".config/git" = {
source = ../../configs/git;
outOfStoreSymlink = true;
recursive = true;
};
".config/user-dirs.dirs" = {
source = ../../configs/user-dirs.dirs;
outOfStoreSymlink = true;
@@ -86,5 +88,15 @@ in
outOfStoreSymlink = true;
recursive = false;
};
".bashrc" = {
source = ../../configs/bash/bashrc;
outOfStoreSymlink = true;
recursive = false;
};
".gnupg/gpg-agent.conf" = {
source = ../../configs/gnupg/gpg-agent.conf;
outOfStoreSymlink = true;
recursive = false;
};
};
}
hosts/graphical/pkgs.nix
+4 -61
View File
@@ -5,18 +5,20 @@
{
# BEGIN PACKAGES
home.packages = with pkgs; [
users.users.liamm.packages = with pkgs; [
adw-gtk3
arc-icon-theme
audacity
bibata-cursors
brave
btop
diff-so-fancy
emacs-all-the-icons-fonts
emacs-gtk
emacsPackages.pdf-tools
exfatprogs
fastfetch
feh
ffmpeg
floorp-bin
focus
@@ -39,6 +41,7 @@
mupdf
nwg-displays
nwg-look
obs-studio
openvpn
prismlauncher
signal-desktop
@@ -51,65 +54,5 @@
wev
zoom-us
];
# BEGIN PROGRAMS
programs = {
bash = {
enable = true;
enableCompletion = true;
enableVteIntegration = true;
initExtra =''
if [[ -z $ORIG_SHLVL ]]; then
export ORIG_SHLVL=$SHLVL
fi;
if [[ $SHLVL -gt $ORIG_SHLVL ]]; then
export PS1='\[\e[1;m\e[1;33m\e[1;m\] ($(($SHLVL - $ORIG_SHLVL))) \W\[\e[m\e[m\] 🐧 \[\e[1;32m\]~> \[\e[m\e[m\]'
else
export PS1='\[\e[1;m\e[1;33m\e[1;m\] \W\[\e[m\e[m\] 🐧 \[\e[1;32m\]~> \[\e[m\e[m\]'
fi;
export PATH="$HOME/.local/bin:$PATH"
set -o vi
fastfetch
'';
shellAliases = {
build = "./build.sh";
emacsd = "emacs --daemon";
emacsc = "emacsclient -c -a 'emacs'";
gap = "git add -p";
gcp = "git commit -p";
kpx = "keepassxc-cli open";
ls = "ls --color=auto";
ll = "ls -l";
la = "ls -lA";
fastfetch = "fastfetch -c $HOME/.config/fastfetch/config.json";
new = "source $HOME/.bashrc";
newbar = "pkill waybar; waybar &disown";
ping = "ping -c 5";
vi = "\\vim";
vim = "nvim";
".." = "cd ..";
};
};
dank-material-shell = {
enable = true;
};
feh.enable = true;
git = {
enable = true;
lfs.enable = true;
signing.format = "openpgp";
settings = {
user.email = "maloneliam@proton.me";
user.name = "Liam Malone";
};
};
obs-studio = {
enable = true;
};
diff-so-fancy = {
enable = true;
enableGitIntegration = true;
};
};
}
hosts/graphical/services.nix
+40 -22
View File
@@ -1,28 +1,46 @@
{ pkgs, ... }:
{
services = {
emacs = {
enable = true;
package = pkgs.emacs-gtk;
client = {
enable = true;
arguments = [
"-c"
"-a emacs"
];
};
startWithUserSession = "graphical";
# Emacs daemon
systemd.user.services.emacs = {
description = "Emacs text editor";
wantedBy = [ "graphical-session.target" ];
wants = [ "graphical-session.target" ];
after = [ "graphical-session.target" ];
serviceConfig = {
Type = "notify";
ExecStart = "${pkgs.emacs-gtk}/bin/emacs --fg-daemon";
ExecStop = "${pkgs.emacs-gtk}/bin/emacsclient --eval '(kill-emacs)'";
TimeoutStartSec = "10min";
Restart = "on-failure";
};
gpg-agent = {
enable = true;
defaultCacheTtl = 1800;
enableSshSupport = true;
};
gnome-keyring.enable = true;
mpris-proxy.enable = true;
nextcloud-client.enable = true;
};
# Bluetooth media key proxy
systemd.user.services.mpris-proxy = {
description = "MPRIS proxy for Bluetooth media controls";
wantedBy = [ "bluetooth.target" ];
after = [ "bluetooth.target" ];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
Restart = "on-failure";
};
};
# Nextcloud desktop client
systemd.user.services.nextcloud-client = {
description = "Nextcloud desktop sync client";
wantedBy = [ "graphical-session.target" ];
after = [ "graphical-session.target" "network-online.target" ];
wants = [ "network-online.target" ];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.nextcloud-client}/bin/nextcloud --background";
Restart = "on-failure";
RestartSec = "5s";
};
};
# gnome-keyring and gpg-agent are handled at system level
}