ant/nix-system
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to 24.11

Browse source
This commit is contained in:
ant 2024-12-03 21:44:32 +01:00
parent 1ec2134221
commit 5f23444535
8 changed files with 43 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fish.nix
View file

@ -69,10 +69,10 @@
set -l statusb_color (set_color $bold_flag $fish_color_status) set -l statusb_color (set_color $bold_flag $fish_color_status)
set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus) set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus)
# direnv status # direnv status TODO fix this if condition
if which direnv >/dev/null # if which direnv >/dev/null
set -l direnv_status (direnv status | grep -q "Found RC path" && echo " direnv") set -l direnv_status (direnv status | grep -q "Found RC path" && echo " direnv")
end # end
# echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) \ # echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) \
echo -n -s (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) \ echo -n -s (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) \

21
flake.lock generated
View file

@ -7,42 +7,43 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729414726, "lastModified": 1733050161,
"narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fe56302339bb28e3471632379d733547caec8103", "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729256560, "lastModified": 1733120037,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-24_05": { "nixpkgs-24_05": {
"locked": { "locked": {
"lastModified": 1729181673, "lastModified": 1733016324,
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -2,10 +2,10 @@
description = "Home Manager configuration"; description = "Home Manager configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-24_05.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-24_05.url = "github:nixos/nixpkgs/nixos-24.05";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

3
gaming.nix
View file

@ -3,8 +3,9 @@ nixpkgs.config = { allowUnfree = true; };
home.packages = if variant == "default" then with pkgs; [ home.packages = if variant == "default" then with pkgs; [
lutris lutris
mangohud
prismlauncher prismlauncher
gamemode
mangohud
heroic heroic
steam steam
] ]

7
home.nix
View file

@ -26,6 +26,7 @@
go-mtpfs go-mtpfs
xdg-utils xdg-utils
davfs2 davfs2
sshfs
]; ];
@ -136,7 +137,7 @@
XDG_SESSION_TYPE = "wayland"; XDG_SESSION_TYPE = "wayland";
XDG_SESSION_DESKTOP = "Hyprland"; XDG_SESSION_DESKTOP = "Hyprland";
QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_AUTO_SCREEN_SCALE_FACTOR = "1";
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "0";
XCURSOR_SIZE = "24"; XCURSOR_SIZE = "24";
} // (if variant == "allegro" then { TMPDIR = "/home/${username}/tmp"; } else {}); } // (if variant == "allegro" then { TMPDIR = "/home/${username}/tmp"; } else {});
@ -179,7 +180,7 @@
services.gnome-keyring.enable = true; services.gnome-keyring.enable = true;
services.syncthing.enable = if variant != "allegro" then false else true; services.syncthing.enable = variant != "allegro";
services.kdeconnect.enable = if variant != "allegro" then false else true; services.kdeconnect.enable = variant != "allegro";
programs.home-manager.enable = true; programs.home-manager.enable = true;
} }

27
hyprland.nix
View file

@ -1,11 +1,23 @@
{ config, lib, pkgs, pkgs-unstable, pkgs-24_05, variant, ... }: { { config, lib, pkgs, pkgs-unstable, pkgs-24_05, variant, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
xdg-desktop-portal # xdg-desktop-portal
xdg-desktop-portal-gtk # xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
xwayland # xwayland
]; ];
# xdg.portal = {
# enable = true;
# extraPortals = [
# pkgs.lxqt.xdg-desktop-portal-lxqt
# pkgs.xdg-desktop-portal-kde
# ];
# config = {
# hyprland = { default = [ "lxqt,hyprland" ]; };
# common = { default = [ "kde,gtk" ]; };
# };
# };
home.sessionVariables = { home.sessionVariables = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
GDK_BACKEND = "wayland,x11"; GDK_BACKEND = "wayland,x11";
@ -21,7 +33,7 @@
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = if variant == "allegro" then pkgs.hyprland else pkgs-unstable.hyprland; package = if variant == "allegro" then pkgs.hyprland else pkgs.hyprland;
xwayland.enable = true; xwayland.enable = true;
@ -62,11 +74,6 @@
blur = { blur = {
enabled = false; enabled = false;
}; };
drop_shadow = true;
shadow_range = 8;
shadow_render_power = 4;
"col.shadow_inactive" = "rgba(1a1a1a33)";
"col.shadow" = "rgba(1a1a1aee)";
}; };
animations = { animations = {
@ -300,7 +307,7 @@
# --run "${pkgs.swaybg}/bin/swaybg -m fill -i $bg" # --run "${pkgs.swaybg}/bin/swaybg -m fill -i $bg"
''); '');
monitors = if (variant == "default") then '' monitors = if (variant == "default") then ''
monitor=,highrr,auto,1,vrr,1 monitor=,highrr,auto,1
'' ''
else if variant == "moon" then '' else if variant == "moon" then ''
monitor=,preferred,auto,1 monitor=,preferred,auto,1

5
terminal-software.nix
View file

@ -20,6 +20,7 @@
enable = true; enable = true;
viAlias = true; viAlias = true;
defaultEditor = true; defaultEditor = true;
package = pkgs-unstable.neovim-unwrapped;
extraPackages = (with pkgs; [ extraPackages = (with pkgs; [
nodejs_22 nodejs_22
ocamlPackages.lsp ocamlPackages.lsp
@ -33,8 +34,8 @@
pyright pyright
ripgrep ripgrep
]) ++ (if variant != "allegro" then [ pkgs.gcc ] else [] ); ]) ++ (if variant != "allegro" then [ pkgs.gcc ] else [] );
} };
// lib.attrsets.optionalAttrs (variant == "allegro") { package = pkgs-unstable.neovim-unwrapped;}; # // lib.attrsets.optionalAttrs (variant == "allegro") { package = pkgs-unstable.neovim-unwrapped;};
xdg.mimeApps.defaultApplications = { "text/plain" = "nvim.desktop"; }; xdg.mimeApps.defaultApplications = { "text/plain" = "nvim.desktop"; };

2
ui.nix
View file

@ -95,7 +95,7 @@ in
size = 12.0; size = 12.0;
}; };
import = [ general.import = [
alacrittyLightTheme # default to white alacrittyLightTheme # default to white
"~/.config/alacritty/colors.toml" "~/.config/alacritty/colors.toml"
]; ];