diff --git a/flake.lock b/flake.lock index 27467e3..4efac5c 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1757920978, - "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", + "lastModified": 1758899649, + "narHash": "sha256-Z6IxPlvIS83lKbTIliP2xFj4hJ699/eM7Ubte4iytgQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", + "rev": "6238bbc0ae04951b64a3ad1b69d3e03b8b329e51", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1757791852, - "narHash": "sha256-G7QPn4gnKeXuecVfiglVSUqxufgB4Z4dlO/1zygXsBA=", - "rev": "8981fb5a18ae15f664b27fde437dce3e17030874", + "lastModified": 1758638108, + "narHash": "sha256-VD8osntS4qPeo8v26YXPU9AouBSU1+3Wj6moQXqMAwI=", + "rev": "992c3ae981e75c902f72e8a04b44e902e9501642", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8981fb5a18ae15f664b27fde437dce3e17030874.tar.gz?rev=8981fb5a18ae15f664b27fde437dce3e17030874" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/992c3ae981e75c902f72e8a04b44e902e9501642.tar.gz?rev=992c3ae981e75c902f72e8a04b44e902e9501642" }, "original": { "type": "tarball", @@ -112,11 +112,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757937573, - "narHash": "sha256-B+MT526k5th4x22h213/CgzdkKWIaeaa0+Y0uuCkH/I=", + "lastModified": 1758785683, + "narHash": "sha256-mRn51IeEBXeNh5a6xNLylk4PKBX0s/QQxgkEbYoPq/w=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "134e117c969f42277f1c5e60c8fbcac103c2c454", + "rev": "1bfb978f2f6261b6086e04af17f9418e1fe36d70", "type": "github" }, "original": { @@ -128,11 +128,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -182,14 +182,15 @@ "uv2nix": "uv2nix" }, "locked": { - "path": "./system/extras/pydev/", + "lastModified": 1, + "narHash": "sha256-wBVLwFjGszsaibW+oPRSRFq6vzKPxSmfsh1evEQ56Ow=", + "path": "/nix/store/wi30qwm3xahwkwkm7b96nmsj8ivk0hqs-source/system/extras/pydev", "type": "path" }, "original": { - "path": "./system/extras/pydev/", + "path": "/nix/store/wi30qwm3xahwkwkm7b96nmsj8ivk0hqs-source/system/extras/pydev", "type": "path" - }, - "parent": [] + } }, "pyproject-build-systems": { "inputs": { diff --git a/home/autumn/home.nix b/home/autumn/home.nix index 932eab4..2b28466 100644 --- a/home/autumn/home.nix +++ b/home/autumn/home.nix @@ -50,7 +50,7 @@ ../packages/starship/starship.nix ../packages/thunderbird/thunderbird.nix ../packages/zoxide/zoxide.nix - # ../packages/zsh/zsh.nix + ../packages/zsh/zsh.nix # package bundles ./bundles/langs.nix ]; diff --git a/home/autumn/sysconfs/yukigekko.nix b/home/autumn/sysconfs/yukigekko.nix index 3ec35a7..19a7c61 100644 --- a/home/autumn/sysconfs/yukigekko.nix +++ b/home/autumn/sysconfs/yukigekko.nix @@ -4,6 +4,7 @@ obsidian vscodium-fhs vesktop + avizo ]; programs.bash.initExtra= ''fish''; home.file = { diff --git a/home/packages/river/river.nix b/home/packages/river/river.nix index 3c5447d..84f735b 100644 --- a/home/packages/river/river.nix +++ b/home/packages/river/river.nix @@ -10,6 +10,7 @@ in home.packages = with pkgs; [ wideriver + swaybg ]; diff --git a/home/packages/starship/starship.toml b/home/packages/starship/starship.toml index 8365d94..1744696 100644 --- a/home/packages/starship/starship.toml +++ b/home/packages/starship/starship.toml @@ -2,45 +2,50 @@ add_newline = false format = """ -[█](#D52D00)\ +[█](#E67380)\ $username\ -[](bg:#EF7627 fg:#D52D00)\ +[](bg:#E69875 fg:#E67380)\ $directory\ -[](fg:#EF7627 bg:#FF9A56)\ +[](fg:#E69875 bg:#DBBC7F)\ $git_branch\ $git_status\ -[](fg:#FF9A56 bg:#D162A4)\ +[](fg:#DBBC7F bg:#a7c080 )\ $c\ $python\ $elixir\ $elm\ +$gleam\ $golang\ $haskell\ $java\ $julia\ $nodejs\ $nim\ +$odin\ $rust\ +$scala\ $zig\ -[](fg:#D162A4 bg:#B55690)\ +[](fg:#a7c080 bg:#83c092)\ $docker_context\ -[](fg:#B55690 bg:#A30262)\ +[](fg:#83c092 bg:#7fbbb3)\ $time\ -[ ](fg:#A30262)\ +[](fg:#7fbbb3 bg:#d699B6)\ +[ ](fg:#d699B6)\ \n\ +$direnv\ $status\ $cmd_duration\ -[ ](fg:#d52d00) +[ ](fg:#E67380) """ # You can also replace your username with a neat symbol like  to save some space [username] show_always = true -style_user = "bg:#D52D00" -style_root = "bg:#D52D00" +style_user = "fg:#434f55 bg:#E67380" +style_root = "fg:#434f55 bg:#E67380" format = '[$user ]($style)' [directory] -style = "bg:#EF7627" +style = "fg:#434f55 bg:#E69875" format = "[ $path ]($style)" truncation_length = 3 truncation_symbol = "…/" @@ -60,83 +65,112 @@ truncation_symbol = "…/" [c] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [docker_context] -symbol = " " -style = "fg:#666666 bg:#06969a" -format = '[[ $symbol $context ](fg:#666666 bg:#06969A)]($style) $path' +symbol = " " +style = "fg:#434f55 bg:#8c092" +format = '[[ $symbol $context ](fg:#434f55 bg:#)83c092]($style) $path' [elixir] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [elm] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [git_branch] symbol = " " -style = "fg:#666666 bg:#FF9A56" -format = '[[ $symbol $branch ](fg:#666666 bg:#FF9A56)]($style)' +style = "fg:#434f55 bg:#dbbc7f" +format = '[[ $symbol $branch ](fg:#434f55 bg:#dbbc7f)]($style)' [git_status] -style = "fg:#666666 bg:#FF9A56" -format = '[[($all_status$ahead_behind )](fg:#666666 bg:#FF9A56)]($style)' +style = "fg:#434f55 bg:#dbbc7f" +format = '[[($all_status$ahead_behind )](fg:#434f55 bg:#dbbc7f)]($style)' + +[gleam] +symbol = " " +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [golang] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [haskell] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [java] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [julia] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [nodejs] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [nim] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' + +[odin] +symbol = "󱟜 " +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [rust] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [ruby] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' [python] symbol = " " -style = "fg:#d3c6aa bg:#D162A4" -format = '[[ $symbol ($version) ](fg:#d3c6aa bg:#D162A4)]($style)' +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' + +[scala] +symbol = " " +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' + +[zig] +symbol = " " +style = "fg:#434f55 bg:#a7c080 " +format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)' + +[direnv] +disabled = false +loaded_msg = "󱥾 " +not_loaded_msg = "󱧴 " +allowed_msg = "󱥾 " +not_allowed_msg = "󱧴 " +style = "fg:#434f55 bg:#E67380" +format = '[$loaded_msg$not_loaded_msg$allowed_msg$not_allowed_msg]($style)' [time] disabled = false time_format = "%R" # Hour:Minute Format -style = "fg:#d3c6aa bg:#A30262" -format = '[[ ♥ $time ](bg:#A30262)]($style)' +style = "fg:#434f55 bg:#7fbbb3" +format = '[ ♥ $time ]($style)' [status] disabled = false @@ -147,10 +181,10 @@ not_found_symbol = "󰦀 " sigint_symbol = " " signal_symbol = "󰣧 " recognize_signal_code = false -style = "fg:#d3c6aa bg:#D52D00" +style = "fg:#434f55 bg:#E67380" format = '[ $symbol ]($style)' [cmd_duration] min_time = 10_000 -style = "fg:#d3c6aa bg:#d52d00" +style = "fg:#434f55 bg:#E67380" format = '[$duration]($style)' diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix index 24b6e7e..a61f54b 100644 --- a/system/yukigekko/configuration.nix +++ b/system/yukigekko/configuration.nix @@ -23,6 +23,8 @@ networking.hostName = "yukigekko"; # Define your hostname. networking.networkmanager.enable = true; + services.logind.lidSwitchExternalPower = "ignore"; + time.timeZone = "${timezone}"; programs.river-classic.enable = true; @@ -35,7 +37,7 @@ }; programs.firefox.enable = true; - programs.bash.interactiveShellInit = "fish"; + programs.zsh.enable = true; programs.appimage.enable = true; # programs.openvpn3.enable = true; @@ -57,11 +59,11 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; }; - hardware.nvidia.prime.intelBusId = "PCI:0@0:2:0"; - hardware.nvidia.prime.nvidiaBusId = "PCI:1@0:0:0"; - hardware.nvidia.prime.sync.enable = true; - hardware.nvidia.prime.offload.enable = false; - hardware.nvidia.prime.offload.enableOffloadCmd = false; + # hardware.nvidia.prime.intelBusId = "PCI:0@0:2:0"; + # hardware.nvidia.prime.nvidiaBusId = "PCI:1@0:0:0"; + # hardware.nvidia.prime.sync.enable = true; + # hardware.nvidia.prime.offload.enable = false; + # hardware.nvidia.prime.offload.enableOffloadCmd = false; # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/system/yukigekko/hardware-configuration.nix b/system/yukigekko/hardware-configuration.nix index a4f3545..da37d70 100644 --- a/system/yukigekko/hardware-configuration.nix +++ b/system/yukigekko/hardware-configuration.nix @@ -14,19 +14,17 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/764f812a-99d9-4754-9704-ead067694ff9"; + { device = "/dev/disk/by-uuid/8f1b1098-ae2e-4804-8a3f-65ae10d66b2c"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/B495-E52C"; + { device = "/dev/disk/by-uuid/5B79-90C9"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = - [ { device = "/dev/disk/by-uuid/c9790e7a-e972-44fe-a6f0-160af701a4b7"; } - ]; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's