nixos: 25.11 -> 26.05
This commit is contained in:
parent
763960c0e6
commit
7d45fe1534
10 changed files with 35 additions and 27 deletions
34
flake.lock
generated
34
flake.lock
generated
|
|
@ -65,11 +65,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780290312,
|
||||
"narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=",
|
||||
"lastModified": 1781152676,
|
||||
"narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "115e5211780054d8a890b41f0b7734cafad54dfe",
|
||||
"rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -197,16 +197,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779506708,
|
||||
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
|
||||
"lastModified": 1781319724,
|
||||
"narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
|
||||
"rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"ref": "release-26.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -261,11 +261,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780310866,
|
||||
"narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
|
||||
"lastModified": 1781168557,
|
||||
"narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "4ed851c979641e28597a05086332d75cdc9e395f",
|
||||
"rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -338,11 +338,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1780243769,
|
||||
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
|
||||
"lastModified": 1781074563,
|
||||
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
|
||||
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -354,16 +354,16 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1780511130,
|
||||
"narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=",
|
||||
"lastModified": 1781216227,
|
||||
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "535f3e6942cb1cead3929c604320d3db54b542b9",
|
||||
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-26.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
url = "github:nix-community/home-manager/release-26.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
auto-cpufreq = {
|
||||
|
|
|
|||
|
|
@ -6,5 +6,6 @@
|
|||
name = "Arc";
|
||||
package = pkgs.arc-icon-theme;
|
||||
};
|
||||
gtk4.theme = null;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
viAlias = true;
|
||||
vimdiffAlias = true;
|
||||
withNodeJs = true;
|
||||
withRuby = false;
|
||||
withPython3 = false;
|
||||
coc.enable = true;
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
vim-gitgutter
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@
|
|||
"text/calendar" = ["thunderbird.desktop"];
|
||||
};
|
||||
};
|
||||
userDirs.enable = true;
|
||||
userDirs = {
|
||||
enable = true;
|
||||
setSessionVariables = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@
|
|||
history.size = 10000;
|
||||
history.path = "$HOME/.zsh_history";
|
||||
|
||||
dotDir = config.home.homeDirectory;
|
||||
|
||||
initContent = lib.mkMerge [ beforeCompInit defaultInit ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
wget
|
||||
curl
|
||||
git
|
||||
neofetch
|
||||
fastfetch
|
||||
bat
|
||||
tealdeer
|
||||
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
pavucontrol
|
||||
|
||||
xed-editor
|
||||
mate.mate-calc
|
||||
mate-calc
|
||||
|
||||
xarchiver
|
||||
mate.engrampa
|
||||
engrampa
|
||||
nemo-with-nextcloud-extensions
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -26,10 +26,10 @@
|
|||
dex # autostart applications
|
||||
xbindkeys # bind keys to commands
|
||||
xclip
|
||||
xorg.xbacklight # control screen brightness
|
||||
xbacklight # control screen brightness
|
||||
brightnessctl
|
||||
numlockx
|
||||
xorg.xdpyinfo # get screen information
|
||||
xdpyinfo # get screen information
|
||||
sysstat # get system information
|
||||
|
||||
scrot
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
glib,
|
||||
gtk3,
|
||||
nemo,
|
||||
mate,
|
||||
engrampa,
|
||||
cinnamon-translations,
|
||||
}:
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
popd
|
||||
substituteInPlace src/nemo-engrampa.c \
|
||||
--replace-fail "file-roller" "${lib.getExe mate.engrampa}" \
|
||||
--replace-fail "file-roller" "${lib.getExe engrampa}" \
|
||||
--replace-fail "fileroller" "engrampa" \
|
||||
--replace-fail "FileRoller" "Engrampa" \
|
||||
--replace-quiet "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue