Compare commits
7 Commits
main
..
014780f2b4
| Author | SHA1 | Date | |
|---|---|---|---|
|
014780f2b4
|
|||
|
f3c9117616
|
|||
|
5038e8eaab
|
|||
|
811d516deb
|
|||
|
ce065fd53c
|
|||
|
9022d5e2b0
|
|||
|
f81f94561b
|
Generated
+80
-20
@@ -8,11 +8,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778716662,
|
||||
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||
"lastModified": 1775087534,
|
||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -28,11 +28,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781365335,
|
||||
"narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=",
|
||||
"lastModified": 1777389590,
|
||||
"narHash": "sha256-HWbn7WASXsXGADiBDt6/k9U/HpGBEmoeqIOzrf+z2HE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c",
|
||||
"rev": "8ec5a714dbbeb3fda00bd9758175555ebbad4d07",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -43,11 +43,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1781074563,
|
||||
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
|
||||
"lastModified": 1777268161,
|
||||
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
|
||||
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -66,11 +66,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781388258,
|
||||
"narHash": "sha256-Kx1zxra9sZ215H3OiWUfkulu8N2v3iu19wqlzpD/Ac0=",
|
||||
"lastModified": 1777236345,
|
||||
"narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "e3c908fdf6dff268b04ffb6758bcfc7c018489b9",
|
||||
"rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -83,14 +83,15 @@
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"noctalia-qs": "noctalia-qs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781443008,
|
||||
"narHash": "sha256-ZycdrXdxhHYtw9FV10T6A+Tj1Hkq3WKtWnxQ317uXC8=",
|
||||
"lastModified": 1777253304,
|
||||
"narHash": "sha256-XqSHEKEW5pSAx9MoMo8mKPgkjoy4FEhZ4x0a6hGYrSI=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "2b82e4a2719b8bb0cd2da9716ed30302e9299ed6",
|
||||
"rev": "6773c4750a12c9e9af9c4ce2365e083f1d0d0ad8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -99,6 +100,29 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"noctalia-qs": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noctalia",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_2",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777167795,
|
||||
"narHash": "sha256-VHdtmxVX7oF2+FxYQQPARQmtaHw23FoTBiTaH6ucOEg=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-qs",
|
||||
"rev": "697db4c14e27d841956ff76887fc312443e6fb17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-qs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
@@ -109,19 +133,55 @@
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1774449309,
|
||||
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"ref": "future-26.11",
|
||||
"repo": "default",
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noctalia",
|
||||
"noctalia-qs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775636079,
|
||||
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
../../modules/nixos/audio.nix
|
||||
../../modules/nixos/bootloader.nix
|
||||
../../modules/nixos/calibre.nix
|
||||
../../modules/nixos/claudecode.nix
|
||||
../../modules/nixos/certificates.nix
|
||||
../../modules/nixos/drives.nix
|
||||
../../modules/nixos/gnupg.nix
|
||||
@@ -21,8 +20,6 @@
|
||||
../../modules/nixos/protonvpn.nix
|
||||
../../modules/nixos/services.nix
|
||||
../../modules/nixos/settings.nix
|
||||
../../modules/nixos/stellarium.nix
|
||||
../../modules/nixos/thunar.nix
|
||||
../../modules/nixos/steam.nix
|
||||
../../modules/nixos/users.nix
|
||||
];
|
||||
|
||||
@@ -13,11 +13,9 @@
|
||||
../../modules/nixos/noctalia.nix
|
||||
../../modules/nixos/openssh.nix
|
||||
../../modules/nixos/packages.nix
|
||||
../../modules/nixos/protonvpn.nix
|
||||
../../modules/nixos/sddm.nix
|
||||
../../modules/nixos/services.nix
|
||||
../../modules/nixos/settings.nix
|
||||
../../modules/nixos/stellarium.nix
|
||||
../../modules/nixos/steam.nix
|
||||
../../modules/nixos/users.nix
|
||||
];
|
||||
|
||||
@@ -4,12 +4,6 @@
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
|
||||
# We keep `inputs.nixvim.inputs.nixpkgs.follows = "nixpkgs"` in flake.nix so
|
||||
# the whole config shares a single nixpkgs. Setting `source` explicitly to
|
||||
# that same nixpkgs acknowledges the override and silences nixvim's warning
|
||||
# about its pinned nixpkgs being bypassed.
|
||||
nixpkgs.source = inputs.nixpkgs;
|
||||
|
||||
# set aliases
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
|
||||
@@ -1,123 +0,0 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
# Noctalia v5 shell, managed via its upstream home-manager module.
|
||||
# See https://docs.noctalia.dev/v5/getting-started/nixos/
|
||||
imports = [ inputs.noctalia.homeModules.default ];
|
||||
|
||||
programs.noctalia = {
|
||||
enable = true;
|
||||
|
||||
# The module's `package` option has no default, so it must be set explicitly.
|
||||
package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
|
||||
# settings is rendered to ~/.config/noctalia/config.toml
|
||||
settings = {
|
||||
# theme / colors
|
||||
theme = {
|
||||
source = "builtin";
|
||||
builtin = "Nord";
|
||||
mode = "dark";
|
||||
templates.builtin_ids = [ "ghostty" ];
|
||||
};
|
||||
|
||||
# general
|
||||
shell = {
|
||||
font_family = "0xProto Nerd Font Mono";
|
||||
ui_scale = 1.2;
|
||||
avatar_path = "/home/aaron/syncthing/pictures/Logo-Aaron-Totenkopf-rund-schwarz.png";
|
||||
telemetry_enabled = false;
|
||||
clipboard_enabled = true;
|
||||
password_style = "random";
|
||||
|
||||
panel = {
|
||||
launcher_compact = true;
|
||||
open_near_click_control_center = true;
|
||||
open_near_click_session = true;
|
||||
open_near_click_wallpaper = true;
|
||||
transparency_mode = "glass";
|
||||
};
|
||||
|
||||
screen_corners = {
|
||||
enabled = true;
|
||||
size = 10;
|
||||
};
|
||||
};
|
||||
|
||||
# location / weather
|
||||
location.address = "Bern";
|
||||
|
||||
weather = {
|
||||
enabled = true;
|
||||
unit = "metric";
|
||||
};
|
||||
|
||||
# wallpaper
|
||||
wallpaper = {
|
||||
enabled = true;
|
||||
directory = "/home/aaron/Pictures/Wallpapers";
|
||||
fill_mode = "crop";
|
||||
default.path = "/home/aaron/Pictures/Wallpapers/nord-theme-tower.png";
|
||||
};
|
||||
|
||||
# bar layout
|
||||
bar = {
|
||||
order = [ "default" ];
|
||||
default = {
|
||||
position = "top";
|
||||
background_opacity = 0.93;
|
||||
font_weight = 400;
|
||||
margin_edge = 0;
|
||||
margin_ends = 0;
|
||||
radius = 0;
|
||||
scale = 1.2;
|
||||
widget_spacing = 20;
|
||||
start = [ "control-center" "cpu" "ram" "temp" "active_window" ];
|
||||
center = [ "workspaces" ];
|
||||
end = [ "tray" "bluetooth" "notifications" "volume" "network" "clock" ];
|
||||
};
|
||||
};
|
||||
|
||||
# per-widget styling
|
||||
widget = {
|
||||
bluetooth.capsule = true;
|
||||
control-center = {
|
||||
capsule_radius = 8;
|
||||
custom_image = "/home/aaron/Pictures/nix_flake_logo.png";
|
||||
scale = 1.4;
|
||||
};
|
||||
cpu.capsule = true;
|
||||
network = {
|
||||
capsule = true;
|
||||
show_label = false;
|
||||
};
|
||||
notifications.capsule = true;
|
||||
ram.capsule = true;
|
||||
temp.capsule = true;
|
||||
volume = {
|
||||
capsule = true;
|
||||
show_label = false;
|
||||
};
|
||||
};
|
||||
|
||||
# idle behavior
|
||||
idle = {
|
||||
behavior_order = [ "screen-off" "lock" "lock-and-suspend" ];
|
||||
behavior = {
|
||||
"screen-off" = {
|
||||
enabled = true;
|
||||
timeout = 600;
|
||||
};
|
||||
"lock" = {
|
||||
enabled = true;
|
||||
timeout = 660;
|
||||
};
|
||||
"lock-and-suspend" = {
|
||||
enabled = true;
|
||||
timeout = 1800;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -18,8 +18,5 @@
|
||||
|
||||
# browsers
|
||||
programs.chromium.enable = true;
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
configPath = "${config.xdg.configHome}/mozilla/firefox";
|
||||
};
|
||||
programs.firefox.enable = true;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
|
||||
|
||||
{
|
||||
# configure z-shell to use omz with some plugins
|
||||
programs.zsh = {
|
||||
@@ -8,21 +8,18 @@
|
||||
syntaxHighlighting.enable = true;
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
# add git and agents as plugins
|
||||
# theme will be set below
|
||||
theme = "";
|
||||
plugins = [ "git" "ssh-agent" "gpg-agent" ];
|
||||
# everything here lands before `source $ZSH/oh-my-zsh.sh`
|
||||
extraConfig = ''
|
||||
# make omz faster on large repositories
|
||||
DISABLE_UNTRACKED_FILES_DIRTY=true
|
||||
|
||||
# only display a fancy theme when glyphs are rendered
|
||||
if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
|
||||
ZSH_THEME="gentoo"
|
||||
else
|
||||
ZSH_THEME="agnoster"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
# only display a fancy theme when glyphs are rendered
|
||||
initContent = lib.mkOrder 550 ''
|
||||
if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
|
||||
ZSH_THEME="gentoo"
|
||||
else
|
||||
ZSH_THEME="agnoster"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
# set important env vars
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
claude-code
|
||||
];
|
||||
}
|
||||
@@ -31,9 +31,6 @@
|
||||
options = "--delete-older-than 7d";
|
||||
};
|
||||
};
|
||||
|
||||
# add trusted users (able to modify the nix store)
|
||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
||||
|
||||
# allow unfree packages (steam, protonvpn, discord, etc.)
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# install stellarium for stargazing and sky simulation
|
||||
environment.systemPackages = with pkgs; [
|
||||
stellarium
|
||||
];
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Enable Thunar
|
||||
programs.thunar.enable = true;
|
||||
|
||||
# Install Tumbler thumbnailer service
|
||||
environment.systemPackages = with pkgs; [
|
||||
tumbler
|
||||
];
|
||||
|
||||
# Ensure Thunar can locate the thumbnailer extensions
|
||||
environment.pathsToLink = [ "share/thumbnailers" ];
|
||||
}
|
||||
@@ -6,7 +6,6 @@
|
||||
../../modules/home-manager/git.nix
|
||||
../../modules/home-manager/ghostty.nix
|
||||
../../modules/home-manager/nixvim.nix
|
||||
../../modules/home-manager/noctalia.nix
|
||||
../../modules/home-manager/programs.nix
|
||||
../../modules/home-manager/shell.nix
|
||||
../../modules/home-manager/styling.nix
|
||||
|
||||
Reference in New Issue
Block a user