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

Compare commits

base: nezia:78117b3bb4820f3db3d5d9fad23ed14d3f156208
Branches Tags
nezia:main
nezia:add-notifications-to-waybar
nezia:add-server
..
compare: nezia:0177d29d29e677b2de52e56334f8f93d6fcd2418
Branches Tags
nezia:main
nezia:add-notifications-to-waybar
nezia:add-server

11 commits
78117b3bb4 ... 0177d29d29

Author SHA1 Message Date
Anthony Rodriguez
0177d29d29
home/programs/ironbar: style swaync (add catppuccin macchiato) 2024-11-17 00:30:47 +01:00
Anthony Rodriguez
70f39d017b
home/programs/ironbar: add swaync 2024-11-17 00:30:46 +01:00
Anthony Rodriguez
bdbf7b4117
flake: update inputs 2024-11-17 00:30:46 +01:00
Anthony Rodriguez
ea06324acd
system/programs/fonts: add intel one mono and nerd fonts symbols 2024-11-17 00:30:21 +01:00
Anthony Rodriguez
4e1f78f7f2
treewide: add ironbar for niri 2024-11-17 00:30:21 +01:00
Anthony Rodriguez
e69c0feab9
treewide: fix packages affected by tinted-scheming's breaking changes 2024-11-17 00:24:17 +01:00
Anthony Rodriguez
2cedd8b507
flake: pin nixpkgs (until 24.11 releases) 2024-11-17 00:23:33 +01:00
Anthony Rodriguez
dc6ac4b23c
flake: update inputs 2024-11-15 22:26:01 +01:00
Anthony Rodriguez
d0c4c6da05
treewide: fix deploy issues 
Using absolute path imports is apparently a horrible idea since that
just messes up the store, and will bring a lot of issues since that
copies it to the store separately.
 2024-11-15 19:49:20 +01:00
Anthony Rodriguez
ea922eb16d
treewide: add Apple Color Emoji 2024-11-14 22:13:04 +01:00
Anthony Rodriguez
587708328d
treewide: add ironbar for niri 2024-11-13 23:19:57 +01:00
4 changed files with 86 additions and 166 deletions
Show stats Expand all files Collapse all files

199
flake.lock
View file

@ -4,9 +4,7 @@
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": ["nixpkgs"],
"nixpkgs"
],
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
@ -44,10 +42,7 @@
}, },
"astal": { "astal": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["ags", "nixpkgs"]
"ags",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1731533099, "lastModified": 1731533099,
@ -100,10 +95,7 @@
}, },
"crane_2": { "crane_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["lanzaboote", "nixpkgs"]
"lanzaboote",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1717535930, "lastModified": 1717535930,
@ -121,10 +113,7 @@
}, },
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["agenix", "nixpkgs"]
"agenix",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1700795494, "lastModified": 1700795494,
@ -164,9 +153,7 @@
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": ["nixpkgs"]
"nixpkgs"
]
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
@ -252,10 +239,7 @@
}, },
"flake-parts_2": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": ["lanzaboote", "nixpkgs"]
"lanzaboote",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1717285511,
@ -377,11 +361,7 @@
}, },
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["lanzaboote", "pre-commit-hooks-nix", "nixpkgs"]
"lanzaboote",
"pre-commit-hooks-nix",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1709087332,
@ -416,10 +396,7 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["agenix", "nixpkgs"]
"agenix",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1703113217, "lastModified": 1703113217,
@ -437,9 +414,7 @@
}, },
"home-manager_2": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["nixpkgs"]
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1731786860, "lastModified": 1731786860,
@ -459,7 +434,7 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_5", "nixpkgs": ["nixpkgs"],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
@ -482,9 +457,7 @@
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": ["nixpkgs"],
"nixpkgs"
],
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
@ -555,11 +528,7 @@
}, },
"naersk_2": { "naersk_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["nvf", "rnix-lsp", "nixpkgs"]
"nvf",
"rnix-lsp",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1655042882, "lastModified": 1655042882,
@ -577,14 +546,8 @@
}, },
"nil": { "nil": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": ["nvf", "flake-utils"],
"nvf", "nixpkgs": ["nvf", "nixpkgs"],
"flake-utils"
],
"nixpkgs": [
"nvf",
"nixpkgs"
],
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
@ -605,7 +568,7 @@
"inputs": { "inputs": {
"niri-stable": "niri-stable", "niri-stable": "niri-stable",
"niri-unstable": "niri-unstable", "niri-unstable": "niri-unstable",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-stable": "xwayland-satellite-stable",
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
@ -659,9 +622,7 @@
}, },
"nix-index-db": { "nix-index-db": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["nixpkgs"]
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1731593150, "lastModified": 1731593150,
@ -679,11 +640,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1731740897, "lastModified": 1731797098,
"narHash": "sha256-teFd31vsE/0Z0WR6XVeKhKPw6Eyb2gXGpG0tjpMfBDM=", "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c2c275fbb2e656948ba6e1f67b8ddd430f158c5f", "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -765,22 +726,6 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": {
"lastModified": 1731531548,
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "24f0d4acd634792badd6470134c387a3b039dace",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1726871744, "lastModified": 1726871744,
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
@ -846,7 +791,7 @@
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github" "type": "github"
@ -869,16 +814,16 @@
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1726871744,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github" "type": "github"
@ -891,22 +836,6 @@
} }
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": {
"lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1656753965, "lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
@ -922,6 +851,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1731531548,
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "24f0d4acd634792badd6470134c387a3b039dace",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nmd": { "nmd": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -944,7 +889,7 @@
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"mnw": "mnw", "mnw": "mnw",
"nil": "nil", "nil": "nil",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_7",
"nmd": "nmd", "nmd": "nmd",
"plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-alpha-nvim": "plugin-alpha-nvim",
"plugin-bufdelete-nvim": "plugin-bufdelete-nvim", "plugin-bufdelete-nvim": "plugin-bufdelete-nvim",
@ -1067,12 +1012,8 @@
}, },
"plasma-manager": { "plasma-manager": {
"inputs": { "inputs": {
"home-manager": [ "home-manager": ["home-manager"],
"home-manager" "nixpkgs": ["nixpkgs"]
],
"nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1731193165, "lastModified": 1731193165,
@ -2723,7 +2664,7 @@
}, },
"portfolio": { "portfolio": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_9",
"sam-zola": "sam-zola" "sam-zola": "sam-zola"
}, },
"locked": { "locked": {
@ -2742,15 +2683,9 @@
}, },
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": ["lanzaboote", "flake-compat"],
"lanzaboote",
"flake-compat"
],
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": ["lanzaboote", "nixpkgs"],
"lanzaboote",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
@ -2770,7 +2705,7 @@
"rnix-lsp": { "rnix-lsp": {
"inputs": { "inputs": {
"naersk": "naersk_2", "naersk": "naersk_2",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_8",
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
@ -2800,7 +2735,7 @@
"niri": "niri", "niri": "niri",
"nix-index-db": "nix-index-db", "nix-index-db": "nix-index-db",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"nvf": "nvf", "nvf": "nvf",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
"portfolio": "portfolio", "portfolio": "portfolio",
@ -2811,10 +2746,7 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["ironbar", "nixpkgs"]
"ironbar",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1730341826, "lastModified": 1730341826,
@ -2832,14 +2764,8 @@
}, },
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": ["lanzaboote", "flake-utils"],
"lanzaboote", "nixpkgs": ["lanzaboote", "nixpkgs"]
"flake-utils"
],
"nixpkgs": [
"lanzaboote",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1717813066, "lastModified": 1717813066,
@ -2857,16 +2783,8 @@
}, },
"rust-overlay_3": { "rust-overlay_3": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": ["nvf", "nil", "flake-utils"],
"nvf", "nixpkgs": ["nvf", "nil", "nixpkgs"]
"nil",
"flake-utils"
],
"nixpkgs": [
"nvf",
"nil",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1714529851, "lastModified": 1714529851,
@ -2884,10 +2802,7 @@
}, },
"rust-overlay_4": { "rust-overlay_4": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["wezterm", "nixpkgs"]
"wezterm",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1729477859, "lastModified": 1729477859,
@ -3026,7 +2941,7 @@
}, },
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_11" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1730321837, "lastModified": 1730321837,
@ -3081,9 +2996,7 @@
"freetype2": "freetype2", "freetype2": "freetype2",
"harfbuzz": "harfbuzz", "harfbuzz": "harfbuzz",
"libpng": "libpng", "libpng": "libpng",
"nixpkgs": [ "nixpkgs": ["nixpkgs"],
"nixpkgs"
],
"rust-overlay": "rust-overlay_4", "rust-overlay": "rust-overlay_4",
"zlib": "zlib" "zlib": "zlib"
}, },

8
flake.nix
View file

@ -13,6 +13,7 @@
eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system}); eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
treefmtEval = eachSystem (pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix); treefmtEval = eachSystem (pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
in { in {
imports = [./modules];
devShells = eachSystem (pkgs: { devShells = eachSystem (pkgs: {
default = pkgs.mkShell { default = pkgs.mkShell {
packages = [ packages = [
@ -34,7 +35,7 @@
}; };
inputs = { inputs = {
# nix related # nix related
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c"; # TODO: remove when 24.11 is out
systems.url = "github:nix-systems/default-linux"; systems.url = "github:nix-systems/default-linux";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
lanzaboote = { lanzaboote = {
@ -58,7 +59,10 @@
ags.url = "github:Aylur/ags"; ags.url = "github:Aylur/ags";
basix.url = "github:notashelf/basix"; basix.url = "github:notashelf/basix";
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
ironbar.url = "github:JakeStanger/ironbar"; ironbar = {
url = "github:JakeStanger/ironbar";
inputs.nixpkgs.follows = "nixpkgs";
};
firefox-addons = { firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

4
home/programs/niri/default.nix
View file

@ -6,7 +6,7 @@
osConfig, osConfig,
... ...
}: let }: let
colors = inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette; inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
inherit (lib) getExe mkIf; inherit (lib) getExe mkIf;
in { in {
imports = [./binds.nix]; imports = [./binds.nix];
@ -37,7 +37,7 @@ in {
layout = { layout = {
focus-ring = { focus-ring = {
enable = true; enable = true;
active.color = "#${colors.base0E}"; active.color = palette.base0E;
}; };
always-center-single-column = true; always-center-single-column = true;
}; };

41
home/terminal/emulators/foot.nix
View file

@ -14,28 +14,31 @@
shell = "${lib.getExe config.programs.fish.package}"; shell = "${lib.getExe config.programs.fish.package}";
}; };
colors = let colors = let
schemeData = inputs.basix.schemeData.base16.${osConfig.theme.scheme}; inherit (lib) mapAttrs;
inherit (lib.strings) removePrefix;
# because someone thought this was a great idea: https://github.com/tinted-theming/schemes/commit/61058a8d2e2bd4482b53d57a68feb56cdb991f0b
palette = mapAttrs (_: color: removePrefix "#" color) inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette;
in { in {
background = schemeData.palette.base00; background = palette.base00;
foreground = schemeData.palette.base05; foreground = palette.base05;
regular0 = schemeData.palette.base01; regular0 = palette.base01;
regular1 = schemeData.palette.base08; regular1 = palette.base08;
regular2 = schemeData.palette.base0B; regular2 = palette.base0B;
regular3 = schemeData.palette.base0A; regular3 = palette.base0A;
regular4 = schemeData.palette.base0D; regular4 = palette.base0D;
regular5 = schemeData.palette.base0E; regular5 = palette.base0E;
regular6 = schemeData.palette.base0C; regular6 = palette.base0C;
regular7 = schemeData.palette.base06; regular7 = palette.base06;
bright0 = schemeData.palette.base02; bright0 = palette.base02;
bright1 = schemeData.palette.base08; bright1 = palette.base08;
bright2 = schemeData.palette.base0B; bright2 = palette.base0B;
bright3 = schemeData.palette.base0A; bright3 = palette.base0A;
bright4 = schemeData.palette.base0D; bright4 = palette.base0D;
bright5 = schemeData.palette.base0E; bright5 = palette.base0E;
bright6 = schemeData.palette.base0C; bright6 = palette.base0C;
bright7 = schemeData.palette.base07; bright7 = palette.base07;
}; };
}; };
}; };