fujin/Nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: fujin/Nixos:873bec97fc4aacebcff4774efdc188fa5829b1a7
Branches Tags
fujin/Nixos:master
...
compare: fujin/Nixos:727d6c3da987069c826d6c5a2c780c0f9b18c0a0
Branches Tags
fujin/Nixos:master

2 Commits
873bec97fc ... 727d6c3da9

Author SHA1 Message Date
Alexander 727d6c3da9 Update Nixos 06-07-2026 2026-07-06 13:38:22 +02:00
Alexander 1934cd036e Intorduce noctalia bar 2026-07-03 22:10:45 +02:00
7 changed files with 245 additions and 68 deletions
Expand all files Collapse all files
flake.lock
Generated
+85 -64
View File
@@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1780756231,
"narHash": "sha256-tXQxKdG5716uB9/LIkLQqQwHKf5mRSpHoZhz3lyI2Cg=",
"lastModified": 1782073106,
"narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "6ecde03f47172753fe5a2f334f9d3facfb7e6784",
"rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457",
"type": "github"
},
"original": {
@@ -127,11 +127,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1781648708,
"narHash": "sha256-i9ggnF31Uq3tpdp6ZMe7YAOxjTfkB7S4WjSBfXV0uMk=",
"lastModified": 1783009466,
"narHash": "sha256-Y4rMf21OEgsoD5Fexu5FoqLJEdDGOIttZ5uM9acIM0s=",
"owner": "9001",
"repo": "copyparty",
"rev": "d33d11321f823f58a9109298ef886044f63b02ce",
"rev": "be31a744852a4c04db4c046c91b509ee163e2b61",
"type": "github"
},
"original": {
@@ -166,11 +166,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1782301008,
"narHash": "sha256-GxQhjwF6eNDhP43Yup1LPmjKS1lZaTRvmqgYPOwv3Zs=",
"lastModified": 1783102384,
"narHash": "sha256-DGkEbz6R7XORnFmWsHwIW0pM55QKAVmtm0OAOJvTUUY=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "05d06425c4e17fdf1cbc5cdbf744e5d635993245",
"rev": "8eb5fada90f17ad128506ed6b2b5b2369494719b",
"type": "github"
},
"original": {
@@ -502,11 +502,11 @@
]
},
"locked": {
"lastModified": 1776426399,
"narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
"lastModified": 1782566056,
"narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
"rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8",
"type": "github"
},
"original": {
@@ -532,11 +532,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1782315209,
"narHash": "sha256-xKpodJ++lnLqRpmcH5OSimuo874wmgm3rD85J3GDmUw=",
"lastModified": 1783110106,
"narHash": "sha256-PRnnFkTfQ+sQHSrcWw0512zEMNp5/1WHJeVuDf6FmxI=",
"ref": "refs/heads/main",
"rev": "87cd2a5f6697a5923c4f427e9b399d79a354a7b8",
"revCount": 7499,
"rev": "14fa1fd0273973b7a40966b4fa9e081d6bf67dae",
"revCount": 7549,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
},
@@ -578,11 +578,11 @@
]
},
"locked": {
"lastModified": 1776426575,
"narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
"lastModified": 1782563850,
"narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=",
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"rev": "a968d211048e3ed538e47b84cb3649299578f19d",
"rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178",
"type": "github"
},
"original": {
@@ -608,11 +608,11 @@
]
},
"locked": {
"lastModified": 1781442805,
"narHash": "sha256-Kt56e6Bq2sfqN8yq1RHsS6z+8QKCZelmhaeQQRtZyqU=",
"lastModified": 1782769258,
"narHash": "sha256-HAhqQOoz4S0gzIOMnClL49B+rMT7zdp3UDWeqxtMs/k=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "1f90c674d51a1ef83c725cd6d02280b4c969fdf7",
"rev": "71b8953d7d92dbebe87a6ff9895bdd30e7495873",
"type": "github"
},
"original": {
@@ -714,11 +714,11 @@
]
},
"locked": {
"lastModified": 1772462885,
"narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
"lastModified": 1782554491,
"narHash": "sha256-+p3MlyN/nqRefcf2IckPlGRUn9+hielqpS9XClbLleM=",
"owner": "hyprwm",
"repo": "hyprtoolkit",
"rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
"rev": "bdba25ced39ea39ab004a8f31593ba0b0ff1ca35",
"type": "github"
},
"original": {
@@ -739,11 +739,11 @@
]
},
"locked": {
"lastModified": 1780251518,
"narHash": "sha256-fG9xbb1SOAAJ+2kJRakp3ch+BmA/3dEg/K3PoAZTKkw=",
"lastModified": 1783002634,
"narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "40ede2e7bdec80ba5d4c443160d905e9f841ae5f",
"rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1",
"type": "github"
},
"original": {
@@ -811,11 +811,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1775570192,
"narHash": "sha256-wTLOBy3l/FaIGJWRGFTVYsITkou0lmDU3uAMxvOCCN8=",
"lastModified": 1783008200,
"narHash": "sha256-7019KmcP2U7kx3l60Z5Pgc5SRwbTMHJ2CDuJ/kdhlFA=",
"owner": "Lxtharia",
"repo": "minegrub-theme",
"rev": "8ba52f8402ed642abf0f6eee32c407412a3ceae6",
"rev": "32272c8e674635c2aefae8fbe2243084dccc6ea0",
"type": "github"
},
"original": {
@@ -900,11 +900,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1782166108,
"narHash": "sha256-/EtnQBcKbsaCAGQ5VRcplrHRkR4ryqyLMpBfkVuG9Xw=",
"lastModified": 1782562157,
"narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "875776f0252fcb8618bb948640a0d1f7a5b362be",
"rev": "a9cf7546a938c737b079e738de73934a13de9784",
"type": "github"
},
"original": {
@@ -947,11 +947,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1782116945,
"narHash": "sha256-G3tw/IXmaH6IQ2upZvhuN9sG8CkuX+BLuJDpE8hz0Ds=",
"lastModified": 1782847225,
"narHash": "sha256-JC9PjqKYG9ve5U8aDOLQipp3+KLANBHUvGdLZlxzdKI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "34268251cf5547d39063f2c5ea9a196246f7f3a6",
"rev": "95ca1e203c0750115fd4a6f17d5a245dfe6b1edd",
"type": "github"
},
"original": {
@@ -1023,11 +1023,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1781577229,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"lastModified": 1782723713,
"narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8",
"type": "github"
},
"original": {
@@ -1039,11 +1039,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1780749050,
"narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
"lastModified": 1782467914,
"narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
"rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
"type": "github"
},
"original": {
@@ -1114,6 +1114,26 @@
"type": "github"
}
},
"noctalia": {
"inputs": {
"nixpkgs": [
"unstable"
]
},
"locked": {
"lastModified": 1783105496,
"narHash": "sha256-ZoNxJhEDgEIAH8PM1Qmx6pTzhD6ICkGAe+GYuLKsLq0=",
"owner": "noctalia-dev",
"repo": "noctalia",
"rev": "2abf8758481fa82cc5e5bf5a53269107293cc7ff",
"type": "github"
},
"original": {
"owner": "noctalia-dev",
"repo": "noctalia",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": [
@@ -1149,11 +1169,11 @@
]
},
"locked": {
"lastModified": 1778507602,
"narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
"lastModified": 1781733627,
"narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
"rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
"type": "github"
},
"original": {
@@ -1226,6 +1246,7 @@
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_8",
"noctalia": "noctalia",
"sops-nix": "sops-nix",
"split-monitor-workspaces": "split-monitor-workspaces",
"stylix": "stylix",
@@ -1243,11 +1264,11 @@
]
},
"locked": {
"lastModified": 1782165805,
"narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=",
"lastModified": 1783104586,
"narHash": "sha256-vSLKc7m34/g5xH4dwmNZSqxc5OcHeE3qiG3EIz6bJKs=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "56b24064fdcaedca53553b1a6d607fd23b613a24",
"rev": "1ebd41717762d837d5115f7108522c29cdb00fbb",
"type": "github"
},
"original": {
@@ -1297,11 +1318,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1782310521,
"narHash": "sha256-vsxcG0i8e4EPfdnhMTKMVzD1825H2vG1BBslzom9wxg=",
"lastModified": 1783101802,
"narHash": "sha256-/Ti+wDco0f3C9s94RxyBKJyc0BklwYh0a/jFWKeHNYw=",
"owner": "nix-community",
"repo": "stylix",
"rev": "e084d011e7ee9302aceaaf6c1fc28a9ace09e16a",
"rev": "718c14e8ecba215a65ff955c187fadb9732ddd01",
"type": "github"
},
"original": {
@@ -1458,11 +1479,11 @@
},
"unstable": {
"locked": {
"lastModified": 1781577229,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"lastModified": 1782723713,
"narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8",
"type": "github"
},
"original": {
@@ -1479,11 +1500,11 @@
]
},
"locked": {
"lastModified": 1782358560,
"narHash": "sha256-vCcLh9pw3XO/+Lxk8r6xv6QnoCrTfGqiACcI7O637Wg=",
"lastModified": 1783099620,
"narHash": "sha256-prQSM9PGnrfSaqknJOZ3DCQKbpMiXAWLVC5SHbjLcJ4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3a70e333f2950c302e875c44cfcfaff3f80f36bc",
"rev": "b2e4390ff35319c52935d6a700b615da4c0f204d",
"type": "github"
},
"original": {
@@ -1565,11 +1586,11 @@
]
},
"locked": {
"lastModified": 1780133819,
"narHash": "sha256-0YPKIY3dlnR7SPq7Z8ekFVvzFsfeiAtEj+QUI3KHrlI=",
"lastModified": 1782311043,
"narHash": "sha256-07zLc2M3/ax+JsjxGTft17/Joua41LHE9/9AC/F9zeU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "4a170c0ba96fd37374f93d8f91c9ed91814828ac",
"rev": "882ad01e195ce201b07c618bbee44a0cad8b9e5a",
"type": "github"
},
"original": {
@@ -1584,11 +1605,11 @@
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1782144240,
"narHash": "sha256-RgCWSv7AJZCwPhCzz+J0lvwp1WBz9ouvCnnlmvu0xfw=",
"lastModified": 1783063269,
"narHash": "sha256-XVOopPVgoWPlhuJajUYNTK/M9j/L/llD6vdH5JE9EKs=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "d1693556428967f8b4eef128feb090421ddcaf15",
"rev": "b86380c97016a1c79f535f286a34c0f5b4270a1b",
"type": "github"
},
"original": {
flake.nix
+5
View File
@@ -71,6 +71,11 @@
thefuck.url = "github:LichHunter/thefuck";
backlog.url = "github:LichHunter/backlog";
noctalia = {
url = "github:noctalia-dev/noctalia";
inputs.nixpkgs.follows = "unstable";
};
};
outputs = {
hm-modules/bar/default.nix
+1
View File
@@ -3,5 +3,6 @@
{
imports = [
./waybar
./noctalia
];
}
hm-modules/bar/noctalia/default.nix
+143
View File
@@ -0,0 +1,143 @@
{
config,
lib,
pkgs,
inputs,
...
}:
with lib;
let
cfg = config.dov.bar.noctalia;
c = config.lib.stylix.colors.withHashtag;
# Build a noctalia palette from the active stylix base16 scheme.
# Both dark/light keys carry the same values so the palette works
# regardless of which theme.mode noctalia picks.
mkPalette = variant: {
mPrimary = c.base0D;
mOnPrimary = c.base00;
mSecondary = c.base0E;
mOnSecondary = c.base00;
mTertiary = c.base0C;
mOnTertiary = c.base00;
mError = c.base08;
mOnError = c.base00;
mSurface = if variant == "dark" then c.base00 else c.base07;
mOnSurface = if variant == "dark" then c.base05 else c.base01;
mSurfaceVariant = if variant == "dark" then c.base01 else c.base06;
mOnSurfaceVariant = if variant == "dark" then c.base04 else c.base02;
mHover = if variant == "dark" then mkForce c.base02 else mkForce c.base06;
mOnHover = if variant == "dark" then mkForce c.base06 else mkForce c.base01;
mOutline = c.base03;
mShadow = c.base00;
terminal = {
background = if variant == "dark" then c.base00 else c.base07;
foreground = if variant == "dark" then c.base05 else c.base01;
cursor = if variant == "dark" then c.base05 else c.base01;
cursorText = if variant == "dark" then c.base00 else c.base07;
selectionBg = c.base02;
selectionFg = if variant == "dark" then c.base05 else c.base01;
normal = {
black = c.base00;
red = c.base08;
green = c.base0B;
yellow = c.base0A;
blue = c.base0D;
magenta = c.base0E;
cyan = c.base0C;
white = c.base05;
};
bright = {
black = c.base03;
red = c.base08;
green = c.base0B;
yellow = c.base0A;
blue = c.base0D;
magenta = c.base0E;
cyan = c.base0C;
white = c.base07;
};
};
};
themeMode = if config.stylix.polarity == "dark" then "dark" else "light";
in
{
options.dov.bar.noctalia.enable = mkEnableOption "noctalia bar";
config = mkIf cfg.enable {
programs.noctalia = {
enable = true;
package = inputs.noctalia.packages.${pkgs.system}.default;
systemd.enable = true;
customPalettes.stylix = {
dark = mkPalette "dark";
light = mkPalette "light";
};
settings = {
theme = {
mode = themeMode;
source = "custom";
custom_palette = "stylix";
};
location.address = "Marseille, France";
bar.main = {
position = "top";
thickness = 34;
radius = 12;
margin_h = 0;
margin_v = 6;
padding = 14;
widget_spacing = 6;
capsule = true;
capsule_fill = "surface_variant";
capsule_radius = 20.0;
reserve_space = true;
start = [ "workspaces" "media" "active_window" ];
center = [ "clock" ];
end = [ "tray" "caffeine" "keyboard_layout" "cpu" "ram" "brightness" "volume" "mic" "network" "battery" "session" ];
};
widget = {
clock = {
format = "{:%H:%M}";
tooltip_format = "{:%A, %B %d, %Y}";
};
workspaces.display = "id";
# Named sysmon instances — type field overrides the widget id
cpu = {
type = "sysmon";
stat = "cpu_usage";
};
ram = {
type = "sysmon";
stat = "memory_usage";
};
# Microphone — named volume widget with input device
mic = {
type = "volume";
device = "input";
};
battery.warning_threshold = 30;
keyboard_layout = {
display = "short";
hide_when_single_layout = true;
};
};
};
};
};
}
machines/fujin/main/default.nix
+4 -1
View File
@@ -134,7 +134,10 @@
# Stylix is handled entirely at the Home Manager level (see
# hm-modules/theme). Load the stylix HM module here so the `stylix`
# option exists for fujin's home configuration.
sharedModules = [ inputs.stylix.homeModules.stylix ];
sharedModules = [
inputs.stylix.homeModules.stylix
inputs.noctalia.homeModules.default
];
users."${username}" = { imports = [ ./home.nix ] ++ extraHomeModules; };
};
machines/fujin/main/home.nix
+4 -3
View File
@@ -47,9 +47,10 @@
browser.zen.enable = true;
#window-manager.hypr.enable = true;
bar.waybar.enable = true;
bar = {
waybar.enable = false;
noctalia.enable = true;
};
launcher.wofi.enable = true;
modules/window-manager/hypr/default.nix
+3
View File
@@ -243,6 +243,9 @@ in {
hl.exec_cmd("waybar")
hl.exec_cmd("mako")
''
+ lib.optionalString hm-cfg.bar.noctalia.enable ''
hl.exec_cmd("noctalia")
''
+ ''
end)
'';