Switch to stable

This commit is contained in:
Pedro Rey Anca 2024-08-01 01:21:23 +02:00
parent c9c6091c9e
commit 1a80986ebd
8 changed files with 176 additions and 224 deletions

View file

@ -10,7 +10,7 @@
<p></p>
<div align="center">
<a = href="https://nixos.org">
<img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=303446&logo=NixOS&logoColor=white&color=91D7E3">
<img src="https://img.shields.io/badge/NixOS-24.05-blue.svg?style=for-the-badge&labelColor=303446&logo=NixOS&logoColor=white&color=91D7E3">
</a>
<a href="https://github.com/Frost-Phoenix/nixos-config/blob/main/LICENSE">
<img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=313244&colorB=F5A97F&logo=unlicense&logoColor=F5A97F&"/>

View file

@ -1,13 +1,46 @@
{
"nodes": {
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1722347739,
"narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"catppuccin-bat": {
"flake": false,
"locked": {
"lastModified": 1714038927,
"narHash": "sha256-Q5B4NDrfCIK3UAMs94vdXnR42k4AXCqZz6sRn8bzmf4=",
"lastModified": 1721485583,
"narHash": "sha256-/Ob9iCVyjJDBCXlss9KwFQTuxybmSSzYRBZxOT10PZg=",
"owner": "catppuccin",
"repo": "bat",
"rev": "d714cc1d358ea51bfc02550dabab693f70cccea0",
"rev": "82e7ca555f805b53d2b377390e4ab38c20282e83",
"type": "github"
},
"original": {
@ -58,11 +91,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1719962305,
"narHash": "sha256-LM+8y/cK4aLuWlqHGNhTaaVdIV6e9zCnc4ar3Ux/Q6U=",
"lastModified": 1721524502,
"narHash": "sha256-nu8KFg/dBOWYaf5K9/HOEv7RjFgaKNqlxzv6rlhMjNw=",
"owner": "unmojang",
"repo": "FjordLauncher",
"rev": "a7cf31fd95a129d3246894747121a5e70a9bf431",
"rev": "17da1f266ccf66f30280916cbfa13e1c4b758480",
"type": "github"
},
"original": {
@ -108,24 +141,6 @@
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -155,15 +170,16 @@
]
},
"locked": {
"lastModified": 1720188602,
"narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=",
"lastModified": 1720042825,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e3582e5151498bc4d757e8361431ace8529e7bb7",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@ -173,11 +189,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1718476555,
"narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=",
"lastModified": 1720709712,
"narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60",
"rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade",
"type": "github"
},
"original": {
@ -202,11 +218,11 @@
]
},
"locked": {
"lastModified": 1718450675,
"narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
"lastModified": 1721330371,
"narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
"rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
"type": "github"
},
"original": {
@ -217,6 +233,7 @@
},
"hyprland": {
"inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
@ -226,11 +243,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1720213509,
"narHash": "sha256-aPYf8Jnu1fMgMYMgQnH433/Fcqfky1Z5ZuzCkNKcR1U=",
"lastModified": 1722455246,
"narHash": "sha256-dMcWN+M+VsSsf86ldj7zfOpd9QqM88BXAYYh2mxFWc0=",
"ref": "refs/heads/main",
"rev": "cc98594c3aed0b542e03818371a4636f549f80e1",
"revCount": 4908,
"rev": "37e1411e8d94fe8f3fb678588a7df9b8f931910f",
"revCount": 5033,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -255,11 +272,11 @@
]
},
"locked": {
"lastModified": 1714869498,
"narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"lastModified": 1721326555,
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
"type": "github"
},
"original": {
@ -284,11 +301,11 @@
]
},
"locked": {
"lastModified": 1717881852,
"narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
"lastModified": 1721324361,
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "ec6938c66253429192274d612912649a0cfe4d28",
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
"type": "github"
},
"original": {
@ -297,24 +314,6 @@
"type": "github"
}
},
"hyprpicker": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1719873934,
"narHash": "sha256-2UiP64OYyeeQJnrt3opInzv8IJKeor9nUAoxl87anng=",
"owner": "hyprwm",
"repo": "hyprpicker",
"rev": "b0974381f996f92dc191e6b03adf7d581061619b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprpicker",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
@ -327,11 +326,11 @@
]
},
"locked": {
"lastModified": 1719316102,
"narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
"lastModified": 1722098849,
"narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
"rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
"type": "github"
},
"original": {
@ -352,11 +351,11 @@
]
},
"locked": {
"lastModified": 1719067853,
"narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
"lastModified": 1721324119,
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "914f083741e694092ee60a39d31f693d0a6dc734",
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
"type": "github"
},
"original": {
@ -396,25 +395,6 @@
"type": "github"
}
},
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1720185178,
"narHash": "sha256-9KJ7KXQYDhnAfPIAvYYAEFW+85Gk9gm5W1pMoE/VMFg=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "6caa391790442baea22260296041429fb365e0ce",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "nix-gaming",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1719826879,
@ -431,16 +411,20 @@
"type": "github"
}
},
"nixpkgs-lib": {
"nixpkgs-unstable": {
"locked": {
"lastModified": 1717284937,
"narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
@ -461,11 +445,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1719075281,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
@ -477,59 +461,27 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1683014792,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
"lastModified": 1722221733,
"narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
"rev": "12bf09802d77264e441f48e25459c10c93eada2e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1719468428,
"narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1720031269,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1720262786,
"narHash": "sha256-lOw+DePpT6JEzudxzq/yhDqWW9fOga9vrojV2E1DgAs=",
"lastModified": 1722465185,
"narHash": "sha256-vNu8ztiqTTAvgqYBatM/AuFn9qpJXfNuqGFYA95oVWk=",
"owner": "nix-community",
"repo": "NUR",
"rev": "7907d743f2a29c574db99f3297da264fe5fe7a6e",
"rev": "9ba05057d90d2c8fda1f40685871c0d8dbf81402",
"type": "github"
},
"original": {
@ -577,9 +529,8 @@
"home-manager": "home-manager",
"hypr-contrib": "hypr-contrib",
"hyprland": "hyprland",
"hyprpicker": "hyprpicker",
"nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur"
}
},
@ -615,11 +566,11 @@
]
},
"locked": {
"lastModified": 1718619174,
"narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
"lastModified": 1722365976,
"narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
"rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
"type": "github"
},
"original": {

View file

@ -2,13 +2,11 @@
description = "peprolinbot's nixos configuration";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
hypr-contrib.url = "github:hyprwm/contrib";
hyprpicker.url = "github:hyprwm/hyprpicker";
nix-gaming.url = "github:fufexan/nix-gaming";
fjordlauncher.url = "github:unmojang/FjordLauncher";
@ -19,7 +17,7 @@
};
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -39,6 +37,7 @@
outputs = {
nixpkgs,
nixpkgs-unstable,
self,
...
} @ inputs: let
@ -48,6 +47,10 @@
inherit system;
config.allowUnfree = true;
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
lib = nixpkgs.lib;
in {
nixosConfigurations = {
@ -56,7 +59,7 @@
modules = [(import ./hosts/frues-pc)];
specialArgs = {
host = "frues-pc";
inherit self inputs username;
inherit self inputs username pkgs-unstable;
};
};
frues-port = nixpkgs.lib.nixosSystem {

View file

@ -14,7 +14,7 @@
boot.initrd.kernelModules = ["amdgpu"];
services.xserver.videoDrivers = ["amdgpu"];
hardware.graphics.extraPackages = with pkgs; [
hardware.opengl.extraPackages = with pkgs; [
rocmPackages.clr.icd
amdvlk
];

View file

@ -1,11 +1,4 @@
{pkgs, ...}: {
hardware = {
graphics = {
enable = true;
extraPackages = with pkgs; [
];
};
};
hardware.enableRedistributableFirmware = true;
hardware.flipperzero.enable = true; # Installs and setups everything Flipper Zero

View file

@ -3,13 +3,14 @@
inputs,
username,
host,
pkgs-unstable,
...
}: {
imports = [inputs.home-manager.nixosModules.home-manager];
home-manager = {
useUserPackages = true;
useGlobalPkgs = true;
extraSpecialArgs = {inherit inputs username host;};
extraSpecialArgs = {inherit inputs username host pkgs-unstable;};
users.${username} = {
imports = [./../home];
home.username = "${username}";

View file

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

View file

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