Compare commits

...

6 commits

15 changed files with 153 additions and 108 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 290 KiB

Before After
Before After

119
flake.lock generated
View file

@ -70,11 +70,11 @@
"bt-tracker": { "bt-tracker": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742400565, "lastModified": 1742631003,
"narHash": "sha256-e2NNhOLCJxh4N0rUCVt9s594R8PhxmZ2hw+FRoIC0yU=", "narHash": "sha256-8joGkRd75mq8Wrd+iNTqMqAy51nAGvMVWyqis3iEobg=",
"owner": "XIU2", "owner": "XIU2",
"repo": "TrackersListCollection", "repo": "TrackersListCollection",
"rev": "e069b2e998f22b015e62051e7ede133a15ff59fe", "rev": "8f29f914ae6965e16ef61ca297526a799a210ee4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,11 +332,11 @@
"zon2nix": "zon2nix" "zon2nix": "zon2nix"
}, },
"locked": { "locked": {
"lastModified": 1742411408, "lastModified": 1742589311,
"narHash": "sha256-8MA3lI6meP4N325oRw6oycbv+K3UQyU5J+TecBGY9XE=", "narHash": "sha256-YCAEmOPDSHVKygFov2zOg3Fkb060SRgjiGi4P7y9+kc=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "9c064216a24f5de423bc9c75b65e3948e2f7db55", "rev": "747c43ffa0047aa2ef550aa361ba63f4060a85ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +421,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1742392450, "lastModified": 1742627201,
"narHash": "sha256-i1xsmge/nKNJeLSz7MJ0ZgU10Fnr+MxPhs5v6EYD5R4=", "narHash": "sha256-2sKLhRoN5LJG7LrgxlFB/JmTjj7k9Mgu+QUL1wpxHOg=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "ccf956412307e754d1a8df19366e4d9ef382f1db", "rev": "3a63e85b6ab204bf0e55d56db63ea02263175424",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -442,11 +442,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742411829, "lastModified": 1742588233,
"narHash": "sha256-IwstGdqU2u3NG8KXtjirXCA0s1qm0zkZ7NrhUIVE/VQ=", "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e4a40b441e49443ffd25c05614ad9c134a12e53c", "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -466,11 +466,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1742409616, "lastModified": 1742624823,
"narHash": "sha256-UogCu75sqpoB+xhA5DsWG3CHN4+KsIqymUFjHMdm+U8=", "narHash": "sha256-s2J3pzxnpI0Hf5k1lSA4Q2h6Wso9qvruxgM4UZoMscc=",
"owner": "jj-vcs", "owner": "jj-vcs",
"repo": "jj", "repo": "jj",
"rev": "364ece09e09b5771b2d7aa3a59e1437d0aae2c62", "rev": "78239ee133159b29b6483e9a46ed1012026aef7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -530,11 +530,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1742355568, "lastModified": 1742629677,
"narHash": "sha256-cHW060+beSciKdCK4SZ9vYPOFy/otAq+t9MiO54zKYY=", "narHash": "sha256-x3s8p2rTjB42PQR5yN49qYhEOx/AhykqiNNyDFHmAas=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "10b56ff2ecc915ec26505526125b4f3a3006d5b3", "rev": "b6db5c8dc7e46864b090e01114a2b8b40e7b6c3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -563,11 +563,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742276600, "lastModified": 1742627013,
"narHash": "sha256-muceB5DW++WPqrGKpX3Hkii/DNSMmFs2oQrYRYHmPiU=", "narHash": "sha256-GOp+thjLXji90Apk6yBhH/5+nuYKGdaG7gAaOQba8Lk=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "e251ca7340bc71870c3a81a7ffc3d9bde58e685a", "rev": "0d4f0f00c0cd83a72151468bc610ce230a550027",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -583,11 +583,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1742395601, "lastModified": 1742555319,
"narHash": "sha256-WSoI4R/pY/8AY5ulSn03nry9KFGBGFRFcXjhBYYRYtI=", "narHash": "sha256-EcBXXGcJDDIy2uhr0ObGXGgubbpgdCxvSh5SIGRCFs8=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "7f8e9de5c8494d209bd618dad4ad81e98b19fabc", "rev": "e8207c233ac95a927bfb02f914f02a9d41dbdfa0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -598,11 +598,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1742376361, "lastModified": 1742631601,
"narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", "rev": "380ed15bcd6440606c6856db44a99140d422b46f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -614,11 +614,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742288794, "lastModified": 1742422364,
"narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -661,11 +661,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1742268799, "lastModified": 1742512142,
"narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da044451c6a70518db5b730fe277b70f494188f1", "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -677,11 +677,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1742268799, "lastModified": 1742388435,
"narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da044451c6a70518db5b730fe277b70f494188f1", "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -691,6 +691,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1742422364,
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
@ -717,11 +733,11 @@
"nur-rycee": { "nur-rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742410664, "lastModified": 1742489760,
"narHash": "sha256-IbHml9lhbD+6bNNbzX30zySRs7Y3WteeyDHj/melcmo=", "narHash": "sha256-OkYl/wf09cKviSV1R6SshcRmeX1iDNEKCMg5KlmTwK0=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "4470fe1e563328d9b1d791dd005360ad3539fae3", "rev": "10f7b577f5081b30ca6b7fd5f98de8d7dfdb5a27",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -764,10 +780,7 @@
"niri-flake": "niri-flake", "niri-flake": "niri-flake",
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": [ "nixpkgs": "nixpkgs_2",
"nixos-cosmic",
"nixpkgs"
],
"nur-rycee": "nur-rycee", "nur-rycee": "nur-rycee",
"oskars-dotfiles": "oskars-dotfiles", "oskars-dotfiles": "oskars-dotfiles",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@ -823,11 +836,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742406979, "lastModified": 1742595978,
"narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -864,11 +877,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1742406729, "lastModified": 1742591463,
"narHash": "sha256-k03W8/GTJlCTtf5UaC4PIKSwTVQ3d3farweYvpkb53M=", "narHash": "sha256-CguaHULcm4RuIGN+i4u80dYZujFgZaeOTiShFxCwFhw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "ccb411c5db16341455d82d955fef4db9985741a6", "rev": "113643f332e1f70d90991722f8c4e5a0ace6fd06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1031,11 +1044,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742249030, "lastModified": 1742475924,
"narHash": "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=", "narHash": "sha256-xe3tfHp1aisnUVrCbn1axwpeJzcrSOvQNn1bZt6k5DM=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc", "rev": "1d98ee089c8bad414a346028a7a0f539ad7cfb9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1093,8 +1106,8 @@
}, },
"original": { "original": {
"owner": "jcollie", "owner": "jcollie",
"ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
"repo": "zon2nix", "repo": "zon2nix",
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
"type": "github" "type": "github"
} }
} }

View file

@ -2,10 +2,10 @@
description = "A simple NixOS flakes"; description = "A simple NixOS flakes";
inputs = { inputs = {
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
# nixpkgs.url = "github:NixOS/nixpkgs/master"; # nixpkgs.url = "github:NixOS/nixpkgs/master";
nixpkgs.follows = "nixos-cosmic/nixpkgs"; # nixpkgs.follows = "nixos-cosmic/nixpkgs";
lix-module = { lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module"; url = "git+https://git.lix.systems/lix-project/nixos-module";

View file

@ -40,7 +40,10 @@
david = { david = {
wallpaper.enable = true; wallpaper.enable = true;
programs.openssh.enable = true; programs = {
openssh.enable = true;
niri.enable = true;
};
}; };
home.username = "${unixName}"; home.username = "${unixName}";

View file

@ -7,11 +7,6 @@
... ...
}: }:
{ {
imports = [
./niri
./wluma
];
youthlic = { youthlic = {
xdg-dirs.enable = true; xdg-dirs.enable = true;
programs = { programs = {
@ -50,7 +45,10 @@
david = { david = {
wallpaper.enable = true; wallpaper.enable = true;
programs.openssh.enable = true; programs = {
niri.enable = true;
openssh.enable = true;
};
}; };
home.username = "${unixName}"; home.username = "${unixName}";

View file

@ -1,7 +0,0 @@
{ ... }:
{
youthlic.programs.niri = {
enable = true;
config = ./config.kdl;
};
}

View file

@ -1,4 +0,0 @@
{ ... }:
{
youthlic.programs.wluma.config = ./config.toml;
}

View file

@ -2,5 +2,7 @@
{ {
imports = [ imports = [
./openssh.nix ./openssh.nix
./niri
./wluma
]; ];
} }

View file

@ -0,0 +1,18 @@
{ config, lib, ... }:
let
cfg = config.david.programs.niri;
in
{
options = {
david.programs.niri = {
enable = lib.mkEnableOption "niri";
};
};
config = lib.mkIf cfg.enable {
youthlic.programs.niri = {
enable = true;
config = ./config.kdl;
};
david.programs.wluma.enable = true;
};
}

View file

@ -0,0 +1,14 @@
{ lib, config, ... }:
let
cfg = config.david.programs.wluma;
in
{
options = {
david.programs.wluma = {
enable = lib.mkEnableOption "wluma";
};
};
config = lib.mkIf cfg.enable {
youthlic.programs.wluma.config = ./config.toml;
};
}

View file

@ -34,7 +34,7 @@ in
]; ];
search = { search = {
force = true; force = true;
default = "DuckDuckGo"; default = "ddg";
engines = { engines = {
"Nix Packages" = { "Nix Packages" = {
urls = [ urls = [
@ -131,8 +131,8 @@ in
]; ];
definedAliases = [ "nw" ]; definedAliases = [ "nw" ];
}; };
"Bing".metaData.hidden = true; "bing".metaData.hidden = true;
"Google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias "google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
}; };
}; };
}; };

View file

@ -22,7 +22,7 @@
kanata.enable = true; kanata.enable = true;
tailscale.enable = true; tailscale.enable = true;
}; };
gui.enabled = "cosmic"; gui.enabled = "niri";
}; };
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;

View file

@ -19,37 +19,45 @@ in
kdePackages.qt6ct kdePackages.qt6ct
libsForQt5.qt5ct libsForQt5.qt5ct
]; ];
xdg.mime = { xdg = {
enable = true; terminal-exec = {
defaultApplications = { enable = true;
"inode/directory" = [ settings = {
"com.system76.CosmicFiles.desktop" default = [ "com.mitchellh.ghostty.desktop" ];
]; };
"x-scheme-handler/about" = [ };
"firefox.desktop" mime = {
"chromium-browser.desktop" enable = true;
]; defaultApplications = {
"x-scheme-handler/ftp" = [ "inode/directory" = [
"firefox.desktop" "com.system76.CosmicFiles.desktop"
"chromium-browser.desktop" ];
]; "x-scheme-handler/about" = [
"x-scheme-handler/http" = [ "firefox.desktop"
"firefox.desktop" "chromium-browser.desktop"
"chromium-browser.desktop" ];
]; "x-scheme-handler/ftp" = [
"x-scheme-handler/https" = [ "firefox.desktop"
"firefox.desktop" "chromium-browser.desktop"
"chromium-browser.desktop" ];
]; "x-scheme-handler/http" = [
"x-scheme-handler/mailto" = [ "firefox.desktop"
"firefox.desktop" "chromium-browser.desktop"
"chromium-browser.desktop" ];
]; "x-scheme-handler/https" = [
"x-scheme-handler/tg" = [ "telegramdesktop.desktop" ]; "firefox.desktop"
"x-scheme-handler/unknown" = [ "chromium-browser.desktop"
"firefox.desktop" ];
"chromium-browser.desktop" "x-scheme-handler/mailto" = [
]; "firefox.desktop"
"chromium-browser.desktop"
];
"x-scheme-handler/tg" = [ "telegramdesktop.desktop" ];
"x-scheme-handler/unknown" = [
"firefox.desktop"
"chromium-browser.desktop"
];
};
}; };
}; };
hardware.bluetooth = { hardware.bluetooth = {