diff --git a/flake.lock b/flake.lock index 345247b..08f0447 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "apple-fonts": { + "inputs": { + "nixpkgs": "nixpkgs", + "ny": "ny", + "sf-arabic": "sf-arabic", + "sf-compact": "sf-compact", + "sf-mono": "sf-mono", + "sf-pro": "sf-pro" + }, + "locked": { + "lastModified": 1732029343, + "narHash": "sha256-sAOEhA/vfyAKggwyI3PNy2xeNzb/USZl4YNpeSzMRBI=", + "owner": "lyndeno", + "repo": "apple-fonts.nix", + "rev": "714767021b57d0d30de35eb90e4b748fbbb9c99f", + "type": "github" + }, + "original": { + "owner": "lyndeno", + "repo": "apple-fonts.nix", + "type": "github" + } + }, "base16-schemes": { "flake": false, "locked": { @@ -23,16 +46,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -58,17 +81,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.05", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -88,11 +112,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -101,13 +125,89 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" + } + }, + "ny": { + "flake": false, + "locked": { + "narHash": "sha256-3257NAH4qlan2YHVLpNRy7x8IJqR2pal3OzFo/ykqXs=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" + } + }, "root": { "inputs": { + "apple-fonts": "apple-fonts", "home-manager": "home-manager", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } + }, + "sf-arabic": { + "flake": false, + "locked": { + "narHash": "sha256-/0gjRimqvZyE60xYxxPdlU+7Q2LJnnvtbmwOP0YmS9U=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" + } + }, + "sf-compact": { + "flake": false, + "locked": { + "narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" + } + }, + "sf-mono": { + "flake": false, + "locked": { + "narHash": "sha256-ICdHRFdNL7PM/fXJUzS7LgZxZiqcyIuCMHLze4En4vg=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" + } + }, + "sf-pro": { + "flake": false, + "locked": { + "narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4b185c8..781d477 100644 --- a/flake.nix +++ b/flake.nix @@ -2,19 +2,20 @@ description = "Nixos configuration for Xeovalyte"; inputs = { - nixpkgs.url = "nixpkgs/nixos-24.05"; + nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-colors.url = "github:misterio77/nix-colors"; + apple-fonts.url = "github:lyndeno/apple-fonts.nix"; }; - outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, ... }: + outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, apple-fonts, ... }: let system = "x86_64-linux"; overlay-unstable = final: prev: { diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 4e84fb3..4a89c17 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -51,6 +51,8 @@ extraGroups = [ "networkmanager" "wheel" "dialout" ]; }; + nix.settings.trusted-users = [ "root" "xeovalyte" ]; + boot.kernelPackages = pkgs.linuxPackages_latest; # Configure wacom tablet diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 4da722f..4fcb058 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -46,24 +46,22 @@ # Desktop Applications kdenlive prismlauncher + unstable.modrinth-app unstable.joplin-desktop unstable.prusa-slicer + unstable.font-manager signal-desktop unstable.vesktop unstable.webcord blender - unstable.xournalpp - freecad + unstable.freecad-wayland loupe unstable.rnote - scrcpy unstable.bottles # Office libreoffice - onlyoffice-bin - papers # Image editing gimp diff --git a/modules/home/cli/develop.nix b/modules/home/cli/develop.nix index 8b4b845..2a05eb4 100644 --- a/modules/home/cli/develop.nix +++ b/modules/home/cli/develop.nix @@ -23,6 +23,11 @@ keybinds { normal { bind "Ctrl e" { ToggleFloatingPanes; SwitchToMode "normal"; } + bind "Ctrl 1" { GoToTab 1; } + bind "Ctrl 2" { GoToTab 2; } + bind "Ctrl 3" { GoToTab 3; } + bind "Ctrl 4" { GoToTab 4; } + bind "Ctrl 5" { GoToTab 5; } } } ''; @@ -44,4 +49,39 @@ } ''; }; + + home.file.zellij-layout-dioxus = { + target = ".config/zellij/layouts/dioxus.kdl"; + text = '' + layout { + tab { + pane { + command "hx" + args "." + focus true + } + floating_panes { + pane { + width "80%" + height "80%" + x "10%" + y "10%" + } + } + } + tab { + pane { + command "dx" + args "serve" + } + } + tab { + pane { + command "devenv" + args "up" + } + } + } + ''; + }; } diff --git a/modules/home/gui/common/fonts.nix b/modules/home/gui/common/fonts.nix index 7fffede..8171473 100644 --- a/modules/home/gui/common/fonts.nix +++ b/modules/home/gui/common/fonts.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { fonts.fontconfig.enable = true; @@ -8,6 +8,8 @@ fira-code font-awesome dejavu_fonts + roboto (nerdfonts.override { fonts = [ "DejaVuSansMono" ]; }) + inputs.apple-fonts.packages.${pkgs.system}.sf-pro ]; } diff --git a/modules/home/gui/hyprland/default.nix b/modules/home/gui/hyprland/default.nix index 2594728..3bc6c8a 100644 --- a/modules/home/gui/hyprland/default.nix +++ b/modules/home/gui/hyprland/default.nix @@ -69,10 +69,7 @@ decoration = { rounding = "5"; - drop_shadow = "false"; blur.enabled = "false"; - shadow_render_power = "3"; - "col.shadow" = "rgba(1a1a1aee)"; }; gestures = { diff --git a/modules/system/hardware/amd.nix b/modules/system/hardware/amd.nix index 1284f06..aa285ef 100644 --- a/modules/system/hardware/amd.nix +++ b/modules/system/hardware/amd.nix @@ -3,14 +3,13 @@ { boot.initrd.kernelModules = [ "amdgpu" ]; - hardware.opengl.enable = true; - hardware.opengl.driSupport32Bit = true; - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.enable = true; + hardware.graphics.extraPackages = with pkgs; [ amdvlk mesa.drivers ]; - hardware.opengl.extraPackages32 = with pkgs; [ + hardware.graphics.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];