Compare commits

...

3 commits

Author SHA1 Message Date
00186ec45f flake updates 2024-12-10 17:38:39 +01:00
2c17fc283a variable renames 2024-12-10 17:38:32 +01:00
7c8cdbe5f9 niri experiments 2024-12-10 17:38:17 +01:00
3 changed files with 42 additions and 35 deletions

60
flake.lock generated
View file

@ -302,11 +302,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733484277, "lastModified": 1733769654,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "narHash": "sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "rev": "e952e94955dcc6fa2120c1430789fc41363f5237",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733389730, "lastModified": 1733484277,
"narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,11 +433,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1733474926, "lastModified": 1733826408,
"narHash": "sha256-OYp5iaVJc13jEndTrTRVq/C5jNLLW4B4bwJVRNJRsdU=", "narHash": "sha256-9OOlIYIQA9mO8ZCiGYV0elyh9NwI1iHvSlZDYNQx3V0=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "5a93128d0685e0582428b573bb67f601b11b2ca0", "rev": "2f95cc0bda721e25816a114d9d8619f0b95af256",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -466,11 +466,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733234028, "lastModified": 1733739952,
"narHash": "sha256-YITDP4Jr+sWuQ29WudIBDci7Mh6Ro70XcwYVkxQ1VVU=", "narHash": "sha256-LU4gFrPdB29qzZKJaEoIj87m7N+XaOoFu7POuiiIKhg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "34ce6d0b02420a8e4a5394cb4c4c603b6efef221", "rev": "40fa82275cc092d313a9a60d01a2b4e3e8e3f7d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -487,11 +487,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733351379, "lastModified": 1733570843,
"narHash": "sha256-MTMsAhXxMMVHVN99jT8E0afOAOtt3JQWjYpTja94PAU=", "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "55d07816a0944f06a9df5ef174999a72fa4060c7", "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +502,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733392399, "lastModified": 1733759999,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,11 +517,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1733220138, "lastModified": 1733730953,
"narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "rev": "7109b680d161993918b0a126f38bc39763e5a709",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -546,11 +546,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1733498727, "lastModified": 1733839233,
"narHash": "sha256-R+n4JfXjGrJG2gbhJPsZPTwdDsHoJvwxxpWcRY4KjyQ=", "narHash": "sha256-D+u1Nx6ZwdrqC70hbAvZJC1uVIsLEUdLk1RZvH8ZpQE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "ae78face8d6a09abe2504d41c035b6460c15a17b", "rev": "2e30f4828d2f0c669a3f28a4a32148d02b7a92b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -600,11 +600,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733128155, "lastModified": 1733785344,
"narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -632,11 +632,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1733427445, "lastModified": 1733841628,
"narHash": "sha256-E854RAbAX+DZHDo4HIk2nkqpIvvoAm+P7oDx7TmhWk8=", "narHash": "sha256-cSqwjZC9WOixjn33apjizc2FTSNennP9JvKw0L6Dvi8=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "eb918dbffa24c4dae497f3ce3173660f948d5237", "rev": "5a69e8c65787a962cb3b7ebd855942029a8cba5a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -99,6 +99,7 @@
sops-nix.homeManagerModules.sops sops-nix.homeManagerModules.sops
stylix.homeManagerModules.stylix stylix.homeManagerModules.stylix
niri.homeModules.niri niri.homeModules.niri
niri.homeModules.stylix
./home.nix ./home.nix
]; ];
}; };

View file

@ -152,9 +152,9 @@
fish = { fish = {
enable = true; enable = true;
loginShellInit = '' loginShellInit = ''
if test (tty) = /dev/tty1 # if test (tty) = /dev/tty1
exec sway # exec sway
end # end
''; '';
shellAliases = { shellAliases = {
cat = "bat"; cat = "bat";
@ -277,7 +277,13 @@
''; '';
}; };
niri = { niri = {
enable = false; enable = true;
# settings = {
# environment = {
# "NIXOS_OZONE_WL" = "1";
# "QT_QPA_PLATFORM" = "wayland";
# };
# };
}; };
nixvim = { nixvim = {
enable = true; enable = true;
@ -326,6 +332,7 @@
tabstop = 2; tabstop = 2;
}; };
plugins = { plugins = {
colorizer.enable = true;
comment.enable = true; comment.enable = true;
cmp = { cmp = {
enable = true; enable = true;
@ -364,7 +371,6 @@
noice.enable = false; noice.enable = false;
notify.enable = false; notify.enable = false;
nvim-autopairs.enable = true; nvim-autopairs.enable = true;
nvim-colorizer.enable = true;
obsidian = { obsidian = {
enable = true; enable = true;
settings = { settings = {