Merge remote-tracking branch 'origin/main'

This commit is contained in:
willifan 2024-06-01 00:11:05 +02:00
commit 9b0e3084e7
5 changed files with 33 additions and 28 deletions

47
flake.lock generated
View file

@ -27,15 +27,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716847642, "lastModified": 1716736833,
"narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -57,11 +58,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716509168, "lastModified": 1717144377,
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bfb7a882678e518398ce9a31a881538679f6f092", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1716948383,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,29 +88,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1716633019,
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

View file

@ -4,13 +4,13 @@
inputs = { inputs = {
# NixOS official package source, using the nixos-23.11 branch here # NixOS official package source, using the nixos-23.11 branch here
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
# Declarative dotfile management # Declarative dotfile management
home-manager = { home-manager = {
url = "github:nix-community/home-manager/"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -28,7 +28,6 @@
prusa-slicer prusa-slicer
gimp gimp
cinnamon.nemo-fileroller
]; ];

View file

@ -124,7 +124,7 @@
windowrule = [ windowrule = [
"idleinhibit fullscreen, ^(firefox)$" "idleinhibit fullscreen, ^(firefox)$"
"float, ^(thunar)$" "float, ^(Thunar)$"
"stayfocused, title:^(Enpass Assistant)$" "stayfocused, title:^(Enpass Assistant)$"
"pin, title:^(Enpass Assistant)$" "pin, title:^(Enpass Assistant)$"
"center, title:^(Enpass Assistant)$" "center, title:^(Enpass Assistant)$"

View file

@ -2,6 +2,8 @@
{ {
services.gvfs.enable = true; services.gvfs.enable = true;
services.tumbler.enable = true;
programs.file-roller.enable = true; programs.file-roller.enable = true;
programs.thunar = { programs.thunar = {
@ -10,5 +12,8 @@
thunar-archive-plugin thunar-archive-plugin
thunar-volman thunar-volman
]; ];
}; };
} }