From f103ffdc46654619d540a25bdb7ea9b580687078 Mon Sep 17 00:00:00 2001 From: pupbrained Date: Thu, 15 Aug 2024 01:59:55 -0400 Subject: [PATCH] some stuiffs and also things probablyt --- flake.in.nix | 3 + flake.lock | 125 ++++++++++++++---- flake.nix | 4 + homes/x86_64-linux/marshall@navis/default.nix | 8 -- systems/x86_64-linux/navis/default.nix | 34 +++-- 5 files changed, 131 insertions(+), 43 deletions(-) diff --git a/flake.in.nix b/flake.in.nix index c425de9..4dd882d 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -22,6 +22,7 @@ in { agenix = mkInput "ryantm/agenix"; catppuccin = mkInput "catppuccin/nix"; + chaotic = mkInput "chaotic-cx/nyx/nyxpkgs-unstable"; emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git"; hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland"; @@ -33,6 +34,7 @@ nixvim = mkInput "pupbrained/nvim-config"; treefmt-nix = mkInput "numtide/treefmt-nix"; + cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic"; darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master"; home-manager = mkFollowingNixpkgs "nix-community/home-manager"; nix-index-database = mkFollowingNixpkgs "nix-community/nix-index-database"; @@ -63,6 +65,7 @@ agenix.nixosModules.default catppuccin.nixosModules.catppuccin chaotic.nixosModules.default + cosmic.nixosModules.default impermanence.nixosModules.impermanence ]; diff --git a/flake.lock b/flake.lock index 3d9b648..2a937af 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1722997334, - "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", + "lastModified": 1723691425, + "narHash": "sha256-F25VvHFMaqr26b7goaVWspXaK6XTRFz8RnILV+9OPkk=", "owner": "catppuccin", "repo": "nix", - "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", + "rev": "552056779a136092eb6358c573d925630172fc30", "type": "github" }, "original": { @@ -144,6 +144,29 @@ "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" } }, + "cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1723685697, + "narHash": "sha256-Fp0MmV8FWrWFzYkLzPhkrc7Lj3NhMThCceDiETqEp9k=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "4e1950ec1b6ff25a0f20ff590bf22a3065b62022", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -217,11 +240,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723612799, - "narHash": "sha256-geqgrVgd7Hbxz2q4Htb/BW4Y9A1F/I3HDogi9UfNG+Y=", + "lastModified": 1723700896, + "narHash": "sha256-GzQWHjTVS77PA0ciVOnndeWbX/SNhMtw9XiyPRaceMg=", "ref": "refs/heads/main", - "rev": "37129faa8379c5e138c7caa46625e5fec0c6719a", - "revCount": 15, + "rev": "42bcd32a47f52393572adb90042898a0cc1dc9b3", + "revCount": 20, "type": "git", "url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git" }, @@ -234,7 +257,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1723482913, @@ -273,6 +296,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -288,7 +327,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -302,7 +341,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -319,7 +358,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1650374568, @@ -335,7 +374,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1650374568, @@ -783,11 +822,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1723579231, - "narHash": "sha256-PL9C3aOetj+TS+vXvNhh7q5bm3g70oakg+iSu5eQBUQ=", + "lastModified": 1723656907, + "narHash": "sha256-11tgstIQZP3RRrBEF3ym9L6oS+vzqZJ7Mp6eB2PaN+0=", "ref": "refs/heads/main", - "rev": "3b4aabe04c7756fb0a70d78b6f0e701228f46345", - "revCount": 5087, + "rev": "197f8807900afc81c1c92ad17e621d1998ee268b", + "revCount": 5088, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1073,7 +1112,7 @@ }, "nix-super": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "libgit2": "libgit2", "nixpkgs": "nixpkgs_7", @@ -1142,6 +1181,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1723556749, + "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4a92571f9207810b559c9eac203d1f4d79830073", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1723282977, "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", @@ -1373,7 +1428,7 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "home-manager": "home-manager_4", @@ -1456,6 +1511,7 @@ "agenix": "agenix", "catppuccin": "catppuccin", "chaotic": "chaotic", + "cosmic": "cosmic", "darwin": "darwin_2", "emacs": "emacs", "flakegen": "flakegen", @@ -1490,9 +1546,30 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723602049, + "narHash": "sha256-Z/noCSn9WPkv7O77dWKLcBxe4Ub4bWyNzsL5JhjaQfw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ea0bf33a11a26a62c60123c49d96011da396602c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "snowfall-flake": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "nixpkgs": [ "nixpkgs" ], @@ -1514,7 +1591,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "snowfall-flake", @@ -1538,7 +1615,7 @@ }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" @@ -1772,11 +1849,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1723454642, - "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "lastModified": 1723656612, + "narHash": "sha256-6Sx+/VhRPLR+kRf6rnNUFMQ66DUz1DMYajixYUe+CUU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "rev": "4a6d7dccf80a1aa2d04cfaa88d9e5511542a2486", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fd8fa0d..00b5da9 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,10 @@ agenix.url = "github:ryantm/agenix"; catppuccin.url = "github:catppuccin/nix"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + cosmic = { + inputs.nixpkgs.follows = "nixpkgs"; + url = "github:lilyinstarlight/nixos-cosmic"; + }; darwin = { inputs.nixpkgs.follows = "nixpkgs"; url = "github:LnL7/nix-darwin/master"; diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index 6bb289f..ad3efe1 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -157,14 +157,6 @@ }; }; - services.emacs = { - enable = true; - package = inputs.emacs.packages.${pkgs.system}.default; - defaultEditor = true; - socketActivation.enable = true; - client.enable = true; - }; - systemd.user.startServices = "sd-switch"; nix.package = lib.mkForce inputs.nix-super.packages.${pkgs.system}.default; diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index a384fed..0bacc9a 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -131,7 +131,7 @@ with lib // pkgs // inputs; { }; boot = { - blacklistedKernelModules = ["nouveau"]; + blacklistedKernelModules = ["nouveau" "i915"]; kernelPackages = linuxPackages_cachyos; supportedFilesystems = ["btrfs" "ntfs"]; @@ -157,7 +157,8 @@ with lib // pkgs // inputs; { "intel_iommu=on" "iommu=pt" "kvm.ignore_msrs=1" - "modprobe.blacklist=nouveau" + "modprobe.blacklist=nouveau,i915" + "nvidia_drm.fbdev=1" ]; loader = { @@ -230,6 +231,7 @@ with lib // pkgs // inputs; { substituters = [ "https://cache.nixos.org?priority=100" "https://cache.privatevoid.net" + "https://cosmic.cachix.org/" "https://cuda-maintainers.cachix.org" "https://hyprland.cachix.org" "https://nix-community.cachix.org" @@ -240,6 +242,7 @@ with lib // pkgs // inputs; { "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" @@ -410,18 +413,26 @@ with lib // pkgs // inputs; { spice-vdagentd.enable = true; udisks2.enable = true; - greetd = { + emacs = { enable = true; - settings = rec { - initial_session = { - command = "${pkgs.hyprland}/bin/Hyprland"; - user = "marshall"; - }; - - default_session = initial_session; - }; + package = inputs.emacs.packages.${system}.default; }; + # greetd = { + # enable = true; + # settings = rec { + # initial_session = { + # command = "${pkgs.hyprland}/bin/hyprland"; + # user = "marshall"; + # }; + # + # default_session = initial_session; + # }; + # }; + + desktopManager.cosmic.enable = true; + displayManager.cosmic-greeter.enable = true; + libinput = { enable = true; touchpad.naturalScrolling = true; @@ -477,6 +488,7 @@ with lib // pkgs // inputs; { package = config.boot.kernelPackages.nvidiaPackages.beta; modesetting.enable = true; powerManagement.enable = true; + open = false; prime = { sync.enable = true;