peprolinbot/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update to nixos-24.11

Browse source
This commit is contained in:
Pedro Rey Anca 2024-12-24 00:46:33 +01:00
parent 2c102496f0
commit fa0c0d4a5e
Signed by: peprolinbot
GPG key ID: 053EA6E00116533A
9 changed files with 164 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

180
flake.lock
View file

@ -35,11 +35,11 @@
"catppuccin-starship": { "catppuccin-starship": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723819937, "lastModified": 1733541952,
"narHash": "sha256-t/Hmd2dzBn0AbLUlbL8CBt19/we8spY5nMP0Z+VPMXA=", "narHash": "sha256-1w0TJdQP5lb9jCrCmhPlSexf0PkAlcz8GBDEsRjPRns=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "starship", "repo": "starship",
"rev": "3c4749512e7d552adf48e75e5182a271392ab176", "rev": "e99ba6b210c0739af2a18094024ca0bdf4bb3225",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -51,18 +51,16 @@
"fjordlauncher": { "fjordlauncher": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"libnbtplusplus": "libnbtplusplus", "libnbtplusplus": "libnbtplusplus",
"nix-filter": "nix-filter", "nix-filter": "nix-filter",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1726769740, "lastModified": 1733005766,
"narHash": "sha256-2rXcHv0aIhllTCX4AbokvF/9o9H0GslLpJPO8czYC+o=", "narHash": "sha256-GfjY/cCstUaifv/KWJjApLCBF3NjkP4SZ8CIZZ5Upbo=",
"owner": "unmojang", "owner": "unmojang",
"repo": "FjordLauncher", "repo": "FjordLauncher",
"rev": "441d471a931a91e7fdbef59c9f99679572c68316", "rev": "687934433423b9d7c1014867f66f2bc73bd57c91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +72,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1732722421,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,16 +88,16 @@
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"fjordlauncher", "nur",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1719877454, "lastModified": 1733312601,
"narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,28 +106,6 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"fjordlauncher",
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -137,16 +113,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1734366194,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -156,11 +132,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1729224425, "lastModified": 1733056338,
"narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=", "narHash": "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6", "rev": "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -187,11 +163,11 @@
}, },
"nix-filter": { "nix-filter": {
"locked": { "locked": {
"lastModified": 1710156097, "lastModified": 1731533336,
"narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide", "owner": "numtide",
"repo": "nix-filter", "repo": "nix-filter",
"rev": "3342559a24e85fc164b295c3444e8a139924675b", "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,27 +178,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719826879, "lastModified": 1732758367,
"narHash": "sha256-xs7PlULe8O1SAcs/9e/HOjeUjBrU5FNtkAF/bSEcFto=", "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b9014df496d5b68bf7c0145d0e9b0f529ce4f2a8", "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1729256560, "lastModified": 1734649271,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -250,62 +226,53 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1729307008, "lastModified": 1734875076,
"narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", "rev": "1807c2b91223227ad5599d7067a61665c52d1295",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1734649271,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nur": { "nur": {
"locked": {
"lastModified": 1729516261,
"narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=",
"owner": "nix-community",
"repo": "NUR",
"rev": "282dfd5c7da86c7315c231b95e95d71b36f22347",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-parts": "flake-parts",
"fjordlauncher", "nixpkgs": "nixpkgs_4",
"flake-compat" "treefmt-nix": "treefmt-nix"
],
"gitignore": "gitignore",
"nixpkgs": [
"fjordlauncher",
"nixpkgs"
],
"nixpkgs-stable": [
"fjordlauncher",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1719259945, "lastModified": 1734967981,
"narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "narHash": "sha256-KIuQ0VsT710KKVFRKHzBv2aJ0OrvyJA8m/9wMRRoj/Q=",
"owner": "cachix", "owner": "nix-community",
"repo": "pre-commit-hooks.nix", "repo": "NUR",
"rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "rev": "7319b75ff769a1ff0917afde77650110bc441377",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "cachix", "owner": "nix-community",
"repo": "pre-commit-hooks.nix", "repo": "NUR",
"type": "github" "type": "github"
} }
}, },
@ -321,6 +288,27 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur" "nur": "nur"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

4
flake.nix
View file

@ -2,7 +2,7 @@
description = "peprolinbot's nixos configuration"; description = "peprolinbot's nixos configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -11,7 +11,7 @@
fjordlauncher.url = "github:unmojang/FjordLauncher"; fjordlauncher.url = "github:unmojang/FjordLauncher";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

1
modules/core/pipewire.nix
View file

@ -1,5 +1,4 @@
{pkgs, ...}: { {pkgs, ...}: {
sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

2
modules/core/system.nix
View file

@ -21,7 +21,7 @@
}; };
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
inputs.nur.overlay inputs.nur.overlays.default
]; ];
}; };

2
modules/core/virtualisation.nix
View file

@ -17,7 +17,7 @@
spice-protocol spice-protocol
win-virtio win-virtio
win-spice win-spice
gnome.adwaita-icon-theme adwaita-icon-theme
]; ];
# Manage the virtualisation services # Manage the virtualisation services

2
modules/core/wayland.nix
View file

@ -31,7 +31,7 @@
cageArgs = ["-s" "-m" "last"]; # Only show on the last monitor cageArgs = ["-s" "-m" "last"]; # Only show on the last monitor
}; };
services.greetd.settings.initial_session = { services.greetd.settings.initial_session = {
command = "hyprland"; command = "Hyprland";
user = "${username}"; user = "${username}";
}; };
environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es"; environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es";

2
modules/home/kitty.nix
View file

@ -2,7 +2,7 @@
programs.kitty = { programs.kitty = {
enable = true; enable = true;
theme = "Catppuccin-Mocha"; themeFile = "Catppuccin-Mocha";
font = { font = {
name = "JetBrainsMono Nerd Font"; name = "JetBrainsMono Nerd Font";

152
modules/home/packages.nix
View file

@ -1,90 +1,82 @@
{ {pkgs, ...}: {
pkgs,
pkgs-unstable,
...
}: {
xdg.mimeApps.defaultApplications = { xdg.mimeApps.defaultApplications = {
"inode/directory" = ["nemo.desktop"]; "inode/directory" = ["nemo.desktop"];
"application/pdf" = ["okularApplication_pdf.desktop" "org.gnome.Evince.desktop"]; "application/pdf" = ["okularApplication_pdf.desktop" "org.gnome.Evince.desktop"];
"text/plain" = ["org.gnome.TextEditor.desktop"]; "text/plain" = ["org.gnome.TextEditor.desktop"];
}; };
home.packages = home.packages = with pkgs; [
(with pkgs; [ bemoji # emoji picker
bemoji # emoji picker bitwise # cli tool for bit / hex manipulation
bitwise # cli tool for bit / hex manipulation bitwarden-cli
bitwarden-cli distrobox
distrobox boxbuddy
boxbuddy evince # gnome pdf viewer
evince # gnome pdf viewer element-desktop # Matrix client
element-desktop # Matrix client fd # find replacement
fd # find replacement file # Show file information
file # Show file information file-roller # Archive manager
gnome.file-roller # Archive manager fzf # fuzzy finder
fzf # fuzzy finder gimp
gimp gtrash # rm replacement, put deleted files in system trash
gtrash # rm replacement, put deleted files in system trash imagemagick
imagemagick inkscape
inkscape kleopatra # Gpg GUI
kleopatra # Gpg GUI lazygit
lazygit libreoffice
libreoffice nemo-with-extensions # file manager
cinnamon.nemo-with-extensions # file manager jq
jq nitch # systhem fetch util
nitch # systhem fetch util nix-prefetch-github
nix-prefetch-github kdePackages.okular # KDE's pdf viewer/editor (supports digital signing)
kdePackages.okular # KDE's pdf viewer/editor (supports digital signing) ripgrep # grep replacement
ripgrep # grep replacement simple-scan
simple-scan orca-slicer
orca-slicer swappy
swappy tdf # cli pdf viewer
# tdf # cli pdf viewer speedcrunch
speedcrunch thunderbird
thunderbird todo # cli todo list
todo # cli todo list toipe # typing test in the terminal
toipe # typing test in the terminal transmission_4-gtk # torrent client
transmission_4-gtk # torrent client vlc
vlc xournalpp # For notes and pdf editing
xournalpp # For notes and pdf editing yazi # terminal file manager
yazi # terminal file manager yt-dlp
yt-dlp zenity
gnome.zenity wdisplays
wdisplays wireguard-tools
wireguard-tools winetricks
winetricks wineWowPackages.wayland
wineWowPackages.wayland wtype
wtype
# C / C++ # C / C++
gcc gcc
gnumake gnumake
# Python # Python
python3 python3
cmatrix cmatrix
gparted # partition manager gparted # partition manager
ffmpeg ffmpeg
imv # image viewer imv # image viewer
killall killall
libnotify libnotify
man-pages # extra man pages man-pages # extra man pages
mpv # video player mpv # video player
openssl openssl
pamixer # pulseaudio command line mixer pamixer # pulseaudio command line mixer
pavucontrol # pulseaudio volume controle (GUI) pavucontrol # pulseaudio volume controle (GUI)
playerctl # controller for media players playerctl # controller for media players
wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste) wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste)
cliphist # clipboard manager cliphist # clipboard manager
poweralertd poweralertd
qalculate-gtk # calculator qalculate-gtk # calculator
unzip unzip
wget wget
xdg-utils xdg-utils
xxd xxd
alejandra alejandra
]) ];
++ (with pkgs-unstable; [
tdf # cli pdf viewer
]);
} }

4
modules/home/qt.nix
View file

@ -17,8 +17,8 @@
General.theme = "Catppuccin-Mocha-Lavender"; General.theme = "Catppuccin-Mocha-Lavender";
}; };
xdg.configFile."Kvantum/Catppuccin-Mocha-Lavender".source = "${(pkgs.catppuccin-kvantum.override { xdg.configFile."Kvantum/Catppuccin-Mocha-Lavender".source = "${(pkgs.catppuccin-kvantum.override {
accent = "Lavender"; accent = "lavender";
variant = "Mocha"; variant = "mocha";
})}/share/Kvantum/Catppuccin-Mocha-Lavender"; })}/share/Kvantum/Catppuccin-Mocha-Lavender";
xdg.configFile."qt5ct/qt5ct.conf".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" { xdg.configFile."qt5ct/qt5ct.conf".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" {