torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Merge branch 'unstable-switch'

Browse Source
This commit is contained in:
Torjus Håkestad 2024-05-27 15:31:45 +02:00
commit ed491eb0a7
9 changed files with 66 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
flake.lock
View File

@ -26,16 +26,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716729592, "lastModified": 1716736760,
"narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -57,6 +56,22 @@
} }
}, },
"nixpkgs-stable": { "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"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1716655032, "lastModified": 1716655032,
"narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=",
@ -72,7 +87,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1716509168, "lastModified": 1716509168,
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
@ -88,22 +103,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"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"
}
},
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1713248628, "lastModified": 1713248628,
@ -160,7 +159,7 @@
"ghettoptt": "ghettoptt", "ghettoptt": "ghettoptt",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-stable": "nixpkgs-stable",
"notlistener": "notlistener", "notlistener": "notlistener",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
@ -168,7 +167,7 @@
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1716692524, "lastModified": 1716692524,

16
flake.nix
View File

@ -3,10 +3,10 @@
inputs = { inputs = {
# nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11"; nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager?ref=release-23.11"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
@ -17,7 +17,7 @@
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, nixpkgs-unstable , nixpkgs-stable
, sops-nix , sops-nix
, notlistener , notlistener
, ghettoptt , ghettoptt
@ -26,8 +26,8 @@
let let
system = "x86_64-linux"; system = "x86_64-linux";
user = "torjus"; user = "torjus";
overlay-unstable = final: prev: { overlay-stable = final: prev: {
unstable = import nixpkgs-unstable { stable = import nixpkgs-stable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
@ -46,7 +46,7 @@
modules = [ modules = [
({ config, pkgs, ... }: { ({ config, pkgs, ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
overlay-unstable overlay-stable
ghettoptt.overlays.default ghettoptt.overlays.default
]; ];
}) })
@ -60,7 +60,7 @@
modules = [ modules = [
({ config, pkgs, ... }: { ({ config, pkgs, ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
overlay-unstable overlay-stable
notlistener.overlays.default notlistener.overlays.default
ghettoptt.overlays.default ghettoptt.overlays.default
]; ];

2
home/hyprland/hypridle.nix
View File

@ -1,7 +1,7 @@
{ config, osConfig, pkgs, ... }: { { config, osConfig, pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
unstable.hypridle hypridle
]; ];
xdg.configFile = { xdg.configFile = {
"hypr/hypridle.conf" = { "hypr/hypridle.conf" = {

2
home/hyprland/hyprland_gunter.nix
View File

@ -24,7 +24,7 @@
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = pkgs.unstable.hyprland; package = pkgs.hyprland;
settings = { settings = {
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";
"$shiftMainMod" = "SUPER_SHIFT"; "$shiftMainMod" = "SUPER_SHIFT";

2
home/hyprland/hyprlock.nix
View File

@ -1,7 +1,7 @@
{ config, osConfig, pkgs, ... }: { { config, osConfig, pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
unstable.hyprlock hyprlock
]; ];
xdg.configFile = { xdg.configFile = {
"hypr/hyprlock.conf" = { "hypr/hyprlock.conf" = {

34
home/packages/default.nix
View File

@ -12,19 +12,19 @@ in
age age
alacritty alacritty
bat bat
unstable.btop btop
# (unstable.btop.override { # (unstable.btop.override {
# cudaSupport = true; # cudaSupport = true;
# }) # })
bzip2 bzip2
croc croc
unstable.dust dust
easyeffects easyeffects
eza eza
fd fd
ffmpeg ffmpeg
file file
unstable.fzf fzf
go-task go-task
glib glib
jq jq
@ -39,7 +39,7 @@ in
pamixer pamixer
pinentry pinentry
pre-commit pre-commit
(unstable.prismlauncher.override { (prismlauncher.override {
withWaylandGLFW = true; withWaylandGLFW = true;
}) })
pulseaudio pulseaudio
@ -52,19 +52,19 @@ in
spotify spotify
spicetify-cli spicetify-cli
sshfs sshfs
unstable.tldr tldr
unstable.devenv devenv
unstable.ventoy ventoy
discord discord
zoxide zoxide
# k8s tools # k8s tools
unstable.talosctl talosctl
unstable.k9s k9s
unstable.cilium-cli cilium-cli
unstable.kubernetes-helm kubernetes-helm
unstable.cmctl cmctl
unstable.krew krew
# steam # steam
# steam-run # steam-run
@ -73,8 +73,8 @@ in
tokei tokei
unzip unzip
yt-dlp yt-dlp
unstable.zoom-us zoom-us
unstable.vmware-horizon-client vmware-horizon-client
# Editors # Editors
# vscode # vscode
@ -90,7 +90,7 @@ in
typescript typescript
# Py stuff # Py stuff
(unstable.python312.withPackages (p: with p; [ (python312.withPackages (p: with p; [
requests requests
ipython ipython
])) ]))
@ -103,7 +103,7 @@ in
rust-analyzer rust-analyzer
# blender # blender
(unstable.blender.override { (blender.override {
cudaSupport = withCuda; cudaSupport = withCuda;
}) })

4
home/zsh/default.nix
View File

@ -3,10 +3,10 @@
programs.direnv = { programs.direnv = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
package = pkgs.unstable.direnv; package = pkgs.direnv;
nix-direnv = { nix-direnv = {
enable = true; enable = true;
package = pkgs.unstable.nix-direnv; package = pkgs.nix-direnv;
}; };
}; };
programs.zsh = { programs.zsh = {

22
hosts/gunter/configuration.nix
View File

@ -15,7 +15,7 @@
# Bootloader stuff # Bootloader stuff
boot = { boot = {
# Kernel stuff # Kernel stuff
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_xanmod_latest;
kernelParams = [ kernelParams = [
"quiet" "quiet"
"splash" "splash"
@ -66,15 +66,15 @@
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;
# package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.beta;
package = config.boot.kernelPackages.nvidiaPackages.mkDriver { # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "555.42.02"; # version = "555.42.02";
sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk="; # sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
sha256_aarch64 = lib.fakeSha256; # sha256_aarch64 = lib.fakeSha256;
openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; # openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; # settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
persistencedSha256 = lib.fakeSha256; # persistencedSha256 = lib.fakeSha256;
}; # };
}; };
# Setup hyprland # Setup hyprland
@ -94,7 +94,7 @@
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
portalPackage = pkgs.unstable.xdg-desktop-portal-hyprland; portalPackage = pkgs.xdg-desktop-portal-hyprland;
}; };
# Setup common XDG env vars # Setup common XDG env vars

3
system/security.nix
View File

@ -5,6 +5,9 @@
wheelNeedsPassword = false; wheelNeedsPassword = false;
}; };
# Enable polkit
security.polkit.enable = true;
# Enable rtkit # Enable rtkit
security.rtkit.enable = true; security.rtkit.enable = true;
} }