From 858fa7d8158b7bfb2fee4e5c25d6e6dc612cd32c Mon Sep 17 00:00:00 2001 From: mehbark Date: Tue, 24 Jun 2025 18:44:56 -0400 Subject: [PATCH] use nushell --- build.conf.nix | 2 +- configuration.nix | 4 +- flake.lock | 157 +++++++++++++++++++------------------ flake.nix | 4 +- hardware-configuration.nix | 5 ++ home.nix | 6 +- kitty.conf.nix | 2 +- 7 files changed, 94 insertions(+), 86 deletions(-) diff --git a/build.conf.nix b/build.conf.nix index a3978f9..c431a1f 100644 --- a/build.conf.nix +++ b/build.conf.nix @@ -6,7 +6,7 @@ rec { # not all of these actually work btw x11-wms = ["xmonad" "i3"]; # v :o v - wayland-wms = ["hyprland" "sway" "plasma"]; + wayland-wms = ["hyprland" "sway" "plasma" "cosmic"]; wms = x11-wms ++ wayland-wms; # very, very non-exhaustive of course diff --git a/configuration.nix b/configuration.nix index b956ef4..8e76d18 100644 --- a/configuration.nix +++ b/configuration.nix @@ -91,6 +91,7 @@ in services.desktopManager = { plasma6.enable = conf.wm == "plasma"; + cosmic.enable = conf.wm == "cosmic"; }; services.displayManager = { @@ -168,6 +169,7 @@ in openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICyTxPV3S7ms0AJ0tduI3aJP3o2TJCnkirWKaj5i1+DW" ]; + shell = pkgs.nushell; }; virtualisation.vmVariant = { @@ -229,7 +231,7 @@ in }; environment.variables.EDITOR = "nvim"; - environment.variables.SHELL = "fish"; + environment.variables.SHELL = "${pkgs.nushell}/bin/nushell"; environment.variables.TERM = "kitty"; # BAD IDEA! I DON'T HAVE A CONCRETE REASON, MAINLY JUST VIBES # STILL MILES BETTER THAN NIX_AUTO_INSTALL THOUGH diff --git a/flake.lock b/flake.lock index 8a0beef..53575de 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1744289235, - "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", + "lastModified": 1750372185, + "narHash": "sha256-lVBKxd9dsZOH1fA6kSE5WNnt8e+09fN+NL/Q3BjTWHY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", + "rev": "7cef49d261cbbe537e8cb662485e76d29ac4cbca", "type": "github" }, "original": { @@ -42,16 +42,16 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1735713283, - "narHash": "sha256-xC6X49L55xo7AV+pAYclOj5UNWtBo/xx5aB5IehJD0M=", - "rev": "bfba822a4220b0e2c4dc7f36a35e4c8450cd9a9c", - "revCount": 2125, + "lastModified": 1740810935, + "narHash": "sha256-6RzWfxENGlO73jQb3uQNgOvubUFwvveeIg+PZxhAu6s=", + "rev": "f44d7c3596ff028ad9f7fcc31d1941ed585f11b3", + "revCount": 2184, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.2125%2Brev-bfba822a4220b0e2c4dc7f36a35e4c8450cd9a9c/019420f1-c64f-7176-bdf5-3f4f4fe2bac6/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.2184%2Brev-f44d7c3596ff028ad9f7fcc31d1941ed585f11b3/019550c8-7792-7766-8dd2-80fad5595f70/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/nix-community/fenix/0.1.1584.tar.gz" + "url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A" } }, "fh": { @@ -61,12 +61,12 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1740069727, - "narHash": "sha256-yOqXcn/OMfC97t002V8yzZn1PhuV8lIp5szPA7eys1Q=", - "rev": "ed73c2dd1d4ccc6d1588809078ebb2f38431dddc", - "revCount": 683, + "lastModified": 1746473843, + "narHash": "sha256-t7IZlG7rKNbkt2DIU5H0/B0+b4e9YEVJx14ijpOycCw=", + "rev": "f8319fc6a1424db090e8c3e9284ef8f48d6cf111", + "revCount": 726, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.22/0195244a-b1c2-7264-b779-0e1e34d9735f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.24/0196a1f6-04df-7f72-8882-ddcd7de892e2/source.tar.gz" }, "original": { "type": "tarball", @@ -149,15 +149,16 @@ ] }, "locked": { - "lastModified": 1745593878, - "narHash": "sha256-Rq5qNnUWuhQTqzXDcminu7Z1FPSB1wUaKIEfPTyZkAs=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "542078066b1a99cdc5d5fce1365f98b847ca0b5a", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -178,11 +179,11 @@ ] }, "locked": { - "lastModified": 1742215578, - "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", + "lastModified": 1749155331, + "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", + "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", "type": "github" }, "original": { @@ -207,11 +208,11 @@ ] }, "locked": { - "lastModified": 1745015490, - "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", + "lastModified": 1750371717, + "narHash": "sha256-cNP+bVq8m5x2Rl6MTjwfQLCdwbVmKvTH7yqVc1SpiJM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "60754910946b4e2dc1377b967b7156cb989c5873", + "rev": "15c6f8f3a567fec9a0f732cd310a7ff456deef88", "type": "github" }, "original": { @@ -236,11 +237,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1745593751, - "narHash": "sha256-TJ/Nijr83ydAi473NGeazYqcQ0t8lCPU7aaQv98oGg8=", + "lastModified": 1750515748, + "narHash": "sha256-8xDci/Xb/u2FczbO9xwIs3vS8N81O3o38F3XGgoizNI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "742bce016cb848d222fbfcfcf8d3894ea3fdaeff", + "rev": "238887473866a63c0fd70ead614f37ac86333e28", "type": "github" }, "original": { @@ -261,11 +262,11 @@ ] }, "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", + "lastModified": 1749046714, + "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", + "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", "type": "github" }, "original": { @@ -293,11 +294,11 @@ ] }, "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "lastModified": 1749154592, + "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", "owner": "hyprwm", "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", + "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", "type": "github" }, "original": { @@ -329,11 +330,11 @@ ] }, "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "lastModified": 1750371812, + "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", "type": "github" }, "original": { @@ -358,11 +359,11 @@ ] }, "locked": { - "lastModified": 1744468525, - "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", + "lastModified": 1750371198, + "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", + "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", "type": "github" }, "original": { @@ -383,11 +384,11 @@ ] }, "locked": { - "lastModified": 1743950287, - "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", + "lastModified": 1750371096, + "narHash": "sha256-JB1IeJ41y7kWc/dPGV6RMcCUM0Xj2NEK26A2Ap7EM9c=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", + "rev": "38f3a211657ce82a1123bf19402199b67a410f08", "type": "github" }, "original": { @@ -408,11 +409,11 @@ ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1750371869, + "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", "type": "github" }, "original": { @@ -429,16 +430,16 @@ ] }, "locked": { - "lastModified": 1736429049, - "narHash": "sha256-np2K6lbTOq7yugwS0IsEmy+02vxTAF62bp8APnBHsE4=", - "rev": "5891bae1b7fbd8d3a138773fd751e7a532f914aa", - "revCount": 352, + "lastModified": 1745925850, + "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", + "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", + "revCount": 359, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/naersk/0.1.352%2Brev-5891bae1b7fbd8d3a138773fd751e7a532f914aa/01944b3d-93aa-7d30-8c2b-bd5902521c73/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/naersk/0.1.359%2Brev-38bc60bbc157ae266d4a0c96671c6c742ee17a5f/0196814b-3fe7-7501-996a-40369627cec0/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/nix-community/naersk/0.1.345.tar.gz" + "url": "https://flakehub.com/f/nix-community/naersk/0.1.%2A" } }, "nix-darwin": { @@ -448,11 +449,11 @@ ] }, "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "lastModified": 1750325256, + "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9", "type": "github" }, "original": { @@ -484,11 +485,11 @@ ] }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "lastModified": 1747663185, + "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", "type": "github" }, "original": { @@ -499,25 +500,25 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", - "revCount": 714614, + "lastModified": 1746183838, + "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", + "rev": "bf3287dac860542719fe7554e21e686108716879", + "revCount": 717608, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.714614%2Brev-c618e28f70257593de75a7044438efc1c1fc0791/0195155d-20df-7b25-ad70-45871483b8d2/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.717608%2Brev-bf3287dac860542719fe7554e21e686108716879/0196927e-0862-7e0b-a84b-fbc51a400e7c/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2411.%2A.tar.gz" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2411.%2A" } }, "nixpkgs_2": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -529,16 +530,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1745377448, - "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", + "lastModified": 1750400657, + "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -574,11 +575,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -602,11 +603,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1735659655, - "narHash": "sha256-DQgwi3pwaasWWDfNtXIX0lW5KvxQ+qVhxO1J7l68Qcc=", + "lastModified": 1740737930, + "narHash": "sha256-2AW/FJQI/i6bbRB/8HR9l9SjxjuiukJpHdMPgwApPKA=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "085ad107943996c344633d58f26467b05f8e2ff0", + "rev": "fe8444616679f8e50ff9696f4750df1f10e7433d", "type": "github" }, "original": { @@ -674,11 +675,11 @@ ] }, "locked": { - "lastModified": 1744644585, - "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", + "lastModified": 1750372504, + "narHash": "sha256-VBeZb1oqZM1cqCAZnFz/WyYhO8aF/ImagI7WWg/Z3Og=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", + "rev": "400308fc4f9d12e0a93e483c2e7a649e12af1a92", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 29f352f..9cbfa1f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "mehbark's NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; fh.url = "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz"; - home-manager.url = "github:nix-community/home-manager"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index b55fe09..1a1faf8 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -23,6 +23,11 @@ fsType = "vfat"; }; + fileSystems."/disk" = + { device = "/dev/disk/by-uuid/345d3d09-9576-4518-b251-6b53ba2d6e31"; + fsType = "ext4"; + }; + swapDevices = [ { device = "/dev/disk/by-uuid/90bc78b9-a353-4653-8cc1-7265130ca5ff"; } ]; diff --git a/home.nix b/home.nix index 98c70ec..19aefac 100644 --- a/home.nix +++ b/home.nix @@ -12,7 +12,6 @@ in fortune cowsay ponysay - # lutris # mono5 nethack angband @@ -97,6 +96,7 @@ in qbittorrent obsidian + gimp3-with-plugins jetbrains-mono lmmath @@ -128,9 +128,9 @@ in steam steam-run gamemode - rare minigalaxy openrct2 + lunar-client obs-studio kdePackages.kolourpaint kdePackages.kdenlive @@ -361,7 +361,7 @@ in programs.emacs = { enable = true; - package = pkgs.emacs-pgtk.override { withNativeCompilation = !darwin; }; + package = pkgs.emacs.override { withNativeCompilation = !darwin; }; extraPackages = epkgs: with epkgs; [ lsp-mode markdown-mode diff --git a/kitty.conf.nix b/kitty.conf.nix index 87b1ec6..54b5ec2 100644 --- a/kitty.conf.nix +++ b/kitty.conf.nix @@ -1109,7 +1109,7 @@ color15 #ebdbb2 #: Advanced {{{ -shell fish +# shell fish #: The shell program to execute. The default value of . means to use #: whatever shell is set as the default shell for the current user.