nezia/flocon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: nezia:7be50b28f47428efacce2420a88d6a62004f3f6b
Branches Tags
nezia:main
nezia:add-notifications-to-waybar
nezia:add-server
..
compare: nezia:ac9332b512355b2b55f229dfec4e88abf8bc22a8
Branches Tags
nezia:main
nezia:add-notifications-to-waybar
nezia:add-server

No commits in common. "7be50b28f47428efacce2420a88d6a62004f3f6b" and "ac9332b512355b2b55f229dfec4e88abf8bc22a8" have entirely different histories.
7be50b28f4 ... ac9332b512

9 changed files with 49 additions and 70 deletions
Show stats Expand all files Collapse all files

60
flake.lock
View file

@ -155,11 +155,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1732680201, "lastModified": 1732467630,
"narHash": "sha256-3PA+AlonG9xzJrT1NvnD0Id2dBvIVNrSijVwlIinzNo=", "narHash": "sha256-tm4ZWvjaL1xZmfdi6f1KuEf82XuFspFrX9p6pj+qbSE=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "77e347b8897e917e99bf2929a7178d8caa6fd473", "rev": "1f325824ab3a25d9099bc610b9e3825867fe4c1a",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -427,11 +427,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732482255, "lastModified": 1732472774,
"narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "narHash": "sha256-nfD12L8mm1Zcg0keslWrQgaqj+ZSjQnK6Hf6ryIZA0c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "rev": "83002f18468c4471d5f8de8c542ed2422badbf8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -581,11 +581,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1732659819, "lastModified": 1732366896,
"narHash": "sha256-Z1KdUhm4IQAVEodkl19XvPdZyWbU36bBKnregIffxsw=", "narHash": "sha256-dQrHznGma8aWeBESRUCc1onWYoGrM35GDl/uwEB7eG8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "b1ccd1e910af3f72ba02d64f61121b42b4c3184e", "rev": "3131d857c946c75557f5b6fb99a113b6949ea04d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -614,11 +614,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732647766, "lastModified": 1732363756,
"narHash": "sha256-ZUcQN/2bqL4BK+ifHX9Om4HJOZQAMefK7iziO/ZeEDo=", "narHash": "sha256-/E2aRhcvlH2PkkpC2n79UCMZyIkQKWfG4m//UHkeNgU=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "4c480a1ea3280733bc428d9cb38150bfc1a7c36c", "rev": "9c7e8d04d27d2f914ad3e9a54c64b64c34aea4d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732519917, "lastModified": 1732461762,
"narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "narHash": "sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "rev": "bedc30c64442579943c1c6e7579db263d810884f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +649,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1732483221, "lastModified": 1731797098,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -800,11 +800,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1732014248,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -816,11 +816,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1732014248,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1014,11 +1014,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732639391, "lastModified": 1732465698,
"narHash": "sha256-kFtXjoCIqx9xe0ZryPXpqS6l/HVg71aNcuL8Y5e8+pI=", "narHash": "sha256-xiue+Kj2Jm8PwyZQcHl4CaYmMIgo5oi37hVHqiw2Unk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "06e3209d11797d9c741e25df06ab61048746bf93", "rev": "16d65cd02b5de665d1bcfec1616c02c71a1014a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2948,11 +2948,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1732643199, "lastModified": 1732292307,
"narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", "rev": "705df92694af7093dfbb27109ce16d828a79155f",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
home/programs/default.nix
View file

@ -28,22 +28,23 @@
# miscellaneous programs that do not need to be configured # miscellaneous programs that do not need to be configured
home.packages = with pkgs; [ home.packages = with pkgs; [
cinny-desktop
entr
fractal
geary geary
gnome-control-center
imhex imhex
logisim-evolution logisim-evolution
mission-center
nautilus
obsidian obsidian
playerctl
proton-pass proton-pass
simple-scan
vesktop vesktop
wl-clipboard wl-clipboard
fractal
gnome-control-center
playerctl
nautilus
simple-scan
entr
inputs.neovim-flake.packages.${pkgs.system}.default inputs.neovim-flake.packages.${pkgs.system}.default
# https://nixpkgs-tracker.ocfox.me/?pr=357219
# mission-center
# cinny-desktop
]; ];
} }

10
home/programs/waybar/default.nix
View file

@ -156,12 +156,12 @@ in {
(mkIf config.services.swaync.enable { (mkIf config.services.swaync.enable {
"custom/notification" = { "custom/notification" = {
tooltip = false; tooltip = false;
format = "{icon} "; format = "{icon}";
format-icons = { format-icons = {
notification = "󱥁"; notification = "󱅫";
none = "󰍥"; none = "󰂚";
dnd-notification = "󱅮"; dnd-notification = "󱏧";
dnd-none = "󱅯"; dnd-none = "󱏧";
}; };
return-type = "json"; return-type = "json";
exec = "swaync-client -swb"; exec = "swaync-client -swb";

2
home/terminal/default.nix
View file

@ -1,4 +1,4 @@
_: { {
imports = [ imports = [
./programs ./programs
./shell ./shell

9
home/terminal/programs/bat.nix
View file

@ -1,9 +0,0 @@
_: {
programs.bat = {
enable = true;
config.theme = "ansi";
};
home.sessionVariables = {
MANPAGER = "sh -c 'col -bx | bat -l man -p'";
};
}

1
home/terminal/programs/default.nix
View file

@ -1,6 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [ imports = [
./bat.nix
./git.nix ./git.nix
./gnupg.nix ./gnupg.nix
./tmux.nix ./tmux.nix

2
hosts/solaire/default.nix
View file

@ -17,7 +17,7 @@ in {
"${system}/programs/games.nix" "${system}/programs/games.nix"
"${system}/hardware/nvidia.nix" "${system}/hardware/nvidia.nix"
"${system}/services/documentation.nix" "${system}/services/syncthing.nix"
]; ];
home-manager = { home-manager = {

4
system/nix/nixpkgs.nix
View file

@ -3,8 +3,8 @@
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
"cinny-4.2.3" "cinny-4.2.2"
"cinny-unwrapped-4.2.3" "cinny-unwrapped-4.2.2"
"segger-jlink-qt4-796s" "segger-jlink-qt4-796s"
]; ];
segger-jlink.acceptLicense = true; segger-jlink.acceptLicense = true;

12
system/services/documentation.nix
View file

@ -1,12 +0,0 @@
_: {
documentation = {
enable = true;
man = {
enable = true;
man-db.enable = false;
mandoc.enable = true;
generateCaches = true;
};
};
}