tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

Merge branch 'nixbook/master' into zenix/master

Browse source
This commit is contained in:
tristan 2025-03-02 18:22:10 +00:00
commit 5ef0d7cc25
7 changed files with 25 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

42
flake.lock generated
View file

@ -470,15 +470,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable"
"rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1734745015, "lastModified": 1736997002,
"narHash": "sha256-HGl0yR/qfGTO99NfiB5bqTe2nPKmD57opzB/TwhJSW0=", "narHash": "sha256-EPbAFUXgu3agihgA+MJlQe6J18SIEZ4cRm+zhNRbGfo=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "1c922245aec471610533c7a225bf9c20e7002ff2", "rev": "40534c1bc524aa8c433a7a30318d7e20bddb33fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -505,11 +504,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1734600368, "lastModified": 1736867362,
"narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -568,11 +567,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1734424634, "lastModified": 1736883708,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -681,27 +680,6 @@
"stylix": "stylix" "stylix": "stylix"
} }
}, },
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixos-cosmic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1734661750,
"narHash": "sha256-BI58NBdimxu1lnpOrG9XxBz7Cwqy+qIf99zunWofX5w=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "7d3d910d5fd575e6e8c5600d83d54e5c47273bfe",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"

1
flake.nix
View file

@ -64,6 +64,7 @@
./home/programs/mpd.nix ./home/programs/mpd.nix
./home/programs/work.nix ./home/programs/work.nix
./home/programs/graphical.nix ./home/programs/graphical.nix
./home/desktop/cosmic/laptop.nix
]; ];
}; };

7
home/desktop/cosmic/laptop.nix Normal file
View file

@ -0,0 +1,7 @@
{
programs.cosmic = {
panels.Bar.applets.end = [
"com.system76.CosmicAppletBattery"
];
};
}

7
home/programs/graphical.nix
View file

@ -27,12 +27,7 @@
youtube-music youtube-music
# other # other
element-desktop-wayland element-desktop
(makeDesktopItem {
name = "element-desktop-wayland";
desktopName = "Element";
exec = "${element-desktop-wayland}/bin/element-desktop";
})
brave brave
bitwarden bitwarden
]; ];

1
lib/nixvim.nix
View file

@ -26,6 +26,7 @@ in {
smartindent = true; smartindent = true;
scrolloff = 4; scrolloff = 4;
smoothscroll = true; smoothscroll = true;
ignorecase = true;
undofile = true; undofile = true;
undodir = lua ''vim.fn.expand("$HOME/.local/share/nvim/undo")''; undodir = lua ''vim.fn.expand("$HOME/.local/share/nvim/undo")'';

1
nixos/default.nix
View file

@ -29,6 +29,7 @@ in {
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
programs.nm-applet.enable = true;
# fix nixos-containers # fix nixos-containers
networking.nat.enable = true; networking.nat.enable = true;

5
nixos/programs/hyprland.nix
View file

@ -1,5 +1,8 @@
{config, ...}: { {config, ...}: {
programs.hyprland.enable = true; programs.hyprland = {
enable = true;
withUWSM = true;
};
security.pam.services.hyprlock = {}; security.pam.services.hyprlock = {};
imports = [ imports = [