chore: Update to 25.05
This commit is contained in:
parent
dbbd14bbbe
commit
7cfd76eb23
5 changed files with 61 additions and 83 deletions
40
nixos/flake.lock
generated
40
nixos/flake.lock
generated
|
|
@ -25,16 +25,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747688870,
|
"lastModified": 1758463745,
|
||||||
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
|
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d5f1f641b289553927b3801580598d200a501863",
|
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.11",
|
"ref": "release-25.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -62,26 +62,26 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751274312,
|
"lastModified": 1758589230,
|
||||||
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
|
"narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
|
"rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-25.05",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757745802,
|
"lastModified": 1758427187,
|
||||||
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
|
"narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
|
"rev": "554be6495561ff07b6c724047bdd7e0716aa7b46",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -104,11 +104,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724283233,
|
"lastModified": 1758594056,
|
||||||
"narHash": "sha256-XMPn6YHwFOJCGLE9M5F3AEFKA0u+maf8CpIEWmvaQTQ=",
|
"narHash": "sha256-6XyKDRWqBngw1g73e789iyIaw/0VF04ELk/ATtlkTVU=",
|
||||||
"owner": "ThinkChaos",
|
"owner": "ThinkChaos",
|
||||||
"repo": "openconnect-sso",
|
"repo": "openconnect-sso",
|
||||||
"rev": "94f1ddfef1662d56ede0a093bcfc3d23156bc1a1",
|
"rev": "2041471efd331d0591d34e122aefb02690fb233a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -174,11 +174,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758007585,
|
"lastModified": 1758425756,
|
||||||
"narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=",
|
"narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139",
|
"rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -265,11 +265,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757304371,
|
"lastModified": 1758600385,
|
||||||
"narHash": "sha256-EZ3Vwgh5xgXuiPUmr9e1a9dEu3hvEWhRurAKpsAwB2A=",
|
"narHash": "sha256-lRK96/otQ9JAkrjYFkK8sKloujhZ+eS3RFFerMdEKAg=",
|
||||||
"owner": "youwen5",
|
"owner": "youwen5",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "3968348af022fe88468ef8de4f9683076e2e5e4b",
|
"rev": "8fdac24a43e541c644ea26b48ff886533d367155",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,12 @@
|
||||||
description = "System configuration of my machines using flakes";
|
description = "System configuration of my machines using flakes";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-24.11";
|
nixpkgs.url = "nixpkgs/nixos-25.05";
|
||||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-24.11";
|
url = "github:nix-community/home-manager/release-25.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
openconnect-sso = {
|
openconnect-sso = {
|
||||||
|
|
@ -71,11 +71,11 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
home-manager.nixosModule
|
|
||||||
sops-nix.nixosModules.sops
|
|
||||||
|
|
||||||
./modules
|
./modules
|
||||||
./users
|
./users
|
||||||
|
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
sops-nix.nixosModules.sops
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,54 +6,30 @@ in {
|
||||||
options.sisyphus.desktop.gnome.enable = lib.mkEnableOption "GNOME";
|
options.sisyphus.desktop.gnome.enable = lib.mkEnableOption "GNOME";
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
services.xserver = {
|
services = {
|
||||||
enable = true;
|
gnome = {
|
||||||
|
core-apps.enable = false;
|
||||||
|
core-developer-tools.enable = false;
|
||||||
|
core-shell.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
excludePackages = with pkgs; [
|
xserver = {
|
||||||
xterm
|
enable = true;
|
||||||
];
|
|
||||||
|
|
||||||
displayManager.gdm.enable = true;
|
excludePackages = with pkgs; [
|
||||||
desktopManager.gnome.enable = true;
|
xterm
|
||||||
|
];
|
||||||
|
|
||||||
|
displayManager.gdm.enable = true;
|
||||||
|
desktopManager.gnome.enable = true;
|
||||||
|
|
||||||
|
videoDrivers = [ "nvidia" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Start a new instance of application instead of going to that window.
|
# Start a new instance of application instead of going to that window.
|
||||||
environment.systemPackages = with pkgs.gnomeExtensions; [
|
environment.systemPackages = with pkgs.gnomeExtensions; [
|
||||||
launch-new-instance
|
launch-new-instance
|
||||||
];
|
];
|
||||||
|
|
||||||
# Do not use these packages
|
|
||||||
environment.gnome.excludePackages = (with pkgs; [
|
|
||||||
baobab
|
|
||||||
epiphany # Web browser
|
|
||||||
evince # Document viewer
|
|
||||||
gnome-connections # Remote desktop client
|
|
||||||
gnome-console
|
|
||||||
gnome-photos
|
|
||||||
gnome-text-editor
|
|
||||||
gnome-tour
|
|
||||||
loupe # Image viewer
|
|
||||||
snapshot # Camera
|
|
||||||
]) ++ (with pkgs.gnome; [
|
|
||||||
eog # Image viewer
|
|
||||||
file-roller # Archive manager
|
|
||||||
geary # Mail client
|
|
||||||
gedit
|
|
||||||
gnome-calculator
|
|
||||||
gnome-calendar
|
|
||||||
gnome-characters
|
|
||||||
gnome-clocks
|
|
||||||
gnome-contacts
|
|
||||||
gnome-disk-utility
|
|
||||||
gnome-font-viewer
|
|
||||||
gnome-logs
|
|
||||||
gnome-maps
|
|
||||||
gnome-music
|
|
||||||
gnome-system-monitor
|
|
||||||
gnome-weather
|
|
||||||
simple-scan
|
|
||||||
totem # Movie player
|
|
||||||
yelp # Help viewer
|
|
||||||
]);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ final: prev: {
|
||||||
sha256 = "sha256-UzpHAHpQx2MlmBNKm2turjeVmgp5zXKWm3nZbEo0mYE=";
|
sha256 = "sha256-UzpHAHpQx2MlmBNKm2turjeVmgp5zXKWm3nZbEo0mYE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-oHfk68mAIcmOenW7jn71Xpt8hWVDtxyInWhVN2rH+kk=";
|
cargoHash = "sha256-oGpe+kBf6kBboyx/YfbQBt1vvjtXd1n2pOH6FNcbF8M=";
|
||||||
|
|
||||||
buildInputs = with final; [
|
buildInputs = with final; [
|
||||||
cargo
|
cargo
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ in {
|
||||||
nativeMessagingHosts = with pkgs; [
|
nativeMessagingHosts = with pkgs; [
|
||||||
tridactyl-native
|
tridactyl-native
|
||||||
];
|
];
|
||||||
|
# https://mozilla.github.io/policy-templates/
|
||||||
extraPolicies = {
|
extraPolicies = {
|
||||||
DisableFirefoxStudies = true;
|
DisableFirefoxStudies = true;
|
||||||
DisablePocket = true;
|
DisablePocket = true;
|
||||||
|
|
@ -26,7 +27,8 @@ in {
|
||||||
|
|
||||||
# https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265
|
# https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265
|
||||||
ExtensionSettings = {
|
ExtensionSettings = {
|
||||||
"amazom@search.mozilla.org".installation_mode = "blocked";
|
"amazon@search.mozilla.org".installation_mode = "blocked";
|
||||||
|
"google@search.mozilla.org".installation_mode = "blocked";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -42,12 +44,24 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
profiles.tdpeuter.search= {
|
profiles.tdpeuter.search= {
|
||||||
default = "DuckDuckGo";
|
default = "ddg"; # Reference by id instead of by name
|
||||||
force = true;
|
force = true;
|
||||||
engines = {
|
engines = {
|
||||||
"Bing".metaData.hidden = true;
|
"bing".metaData.hidden = true;
|
||||||
"eBay".metaData.hidden = true;
|
"ebay".metaData.hidden = true;
|
||||||
|
|
||||||
|
"GitHub" = {
|
||||||
|
urls = [{
|
||||||
|
template = "https://github.com/search";
|
||||||
|
params = [
|
||||||
|
{ name = "q"; value = "{searchTerms}"; }
|
||||||
|
{ name = "type"; value = "repositories"; }
|
||||||
|
];
|
||||||
|
}];
|
||||||
|
|
||||||
|
icon = "${pkgs.icosystem}/share/icons/icosystem/scalable/apps/github-mark.svg";
|
||||||
|
definedAliases = [ "@gh" ];
|
||||||
|
};
|
||||||
"Nix Packages" = {
|
"Nix Packages" = {
|
||||||
urls = [{
|
urls = [{
|
||||||
template = "https://search.nixos.org/packages";
|
template = "https://search.nixos.org/packages";
|
||||||
|
|
@ -71,18 +85,6 @@ in {
|
||||||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||||
definedAliases = [ "@no" ];
|
definedAliases = [ "@no" ];
|
||||||
};
|
};
|
||||||
"GitHub" = {
|
|
||||||
urls = [{
|
|
||||||
template = "https://github.com/search";
|
|
||||||
params = [
|
|
||||||
{ name = "q"; value = "{searchTerms}"; }
|
|
||||||
{ name = "type"; value = "repositories"; }
|
|
||||||
];
|
|
||||||
}];
|
|
||||||
|
|
||||||
icon = "${pkgs.icosystem}/share/icons/icosystem/scalable/apps/github-mark.svg";
|
|
||||||
definedAliases = [ "@gh" ];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue