From cb65d7c49cf9f965f9a13d4da467f65cc9c4c467 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 10 Oct 2024 09:01:06 -0500 Subject: [PATCH] cosmic working ish, bad performance --- flake.lock | 121 +++++++++++++++--- flake.nix | 11 +- hosts/_common/components/cosmic.nix | 3 + hosts/gpdPocket3/configuration.nix | 6 +- .../components/home_manager/tmux/tmux.nix | 2 +- 5 files changed, 123 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index cd2eacc..7647a53 100644 --- a/flake.lock +++ b/flake.lock @@ -62,6 +62,22 @@ "type": "github" } }, + "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-utils": { "inputs": { "systems": "systems_2" @@ -213,23 +229,60 @@ "type": "github" } }, - "nixpkgs": { + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" + }, "locked": { - "lastModified": 1728001490, - "narHash": "sha256-jyLDB1hREFhujapdfZNOyFGQ2+FlhsnhCBYa9YBWn+4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "52cfd83eee767c5d02089efe79c4811ffc52a046", + "lastModified": 1728443929, + "narHash": "sha256-WFy8+K/bUTXwT9nMPT/Y23dPbW5I2rLEjgTuPC8y3lA=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "a8960f9c66a0c4f2c24ae029da0886df4a68af33", "type": "github" }, "original": { - "owner": "nixos", - "ref": "master", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1728328465, + "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1727907660, "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", @@ -245,6 +298,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1728001490, + "narHash": "sha256-jyLDB1hREFhujapdfZNOyFGQ2+FlhsnhCBYa9YBWn+4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "52cfd83eee767c5d02089efe79c4811ffc52a046", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_stable": { "locked": { "lastModified": 1728328465, @@ -1009,7 +1078,7 @@ "nixpkgs": [ "nixpkgs_stable" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1726755133, @@ -1027,8 +1096,8 @@ }, "ringofstorms-nvim": { "inputs": { - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable_2", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", "nvim_plugin-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip", @@ -1074,7 +1143,7 @@ "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag", "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1728010640, @@ -1083,11 +1152,11 @@ "rev": "4032e16f3b9fc2ceeccb72807ee2b8b47839a475", "revCount": 206, "type": "git", - "url": "ssh://git.joshuabell.xyz:3032/nvim" + "url": "https://git.joshuabell.xyz/nvim" }, "original": { "type": "git", - "url": "ssh://git.joshuabell.xyz:3032/nvim" + "url": "https://git.joshuabell.xyz/nvim" } }, "root": { @@ -1098,6 +1167,7 @@ "h002_nixpkgs": "h002_nixpkgs", "joe_home-manager": "joe_home-manager", "joe_nixpkgs": "joe_nixpkgs", + "nixos-cosmic": "nixos-cosmic", "nixpkgs_stable": "nixpkgs_stable", "nypkgs": "nypkgs", "ragenix": "ragenix", @@ -1105,6 +1175,27 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728354625, + "narHash": "sha256-r+Sa1NRRT7LXKzCaVaq75l1GdZcegODtF06uaxVVVbI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d216ade5a0091ce60076bf1f8bc816433a1fc5da", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "ragenix", @@ -1125,7 +1216,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "inputs": { "nixpkgs": [ "ringofstorms-nvim", diff --git a/flake.nix b/flake.nix index 2196cef..0bb57ec 100644 --- a/flake.nix +++ b/flake.nix @@ -128,7 +128,16 @@ "${nixConfig.name}" = nixConfig.settings.nixpkgs.lib.nixosSystem { # module = nixConfig.overrides.modules or [...] - modules = [ ./hosts/_common/configuration.nix ]; + modules = [ + # { + # nix.settings = { + # substituters = [ "https://cosmic.cachix.org/" ]; + # trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + # }; + # } + # inputs.nixos-cosmic.nixosModules.default + ./hosts/_common/configuration.nix + ]; specialArgs = inputs // { ylib = nypkgs.legacyPackages.${nixConfig.opts.system}.lib; settings = diff --git a/hosts/_common/components/cosmic.nix b/hosts/_common/components/cosmic.nix index ebb1f09..a64824b 100644 --- a/hosts/_common/components/cosmic.nix +++ b/hosts/_common/components/cosmic.nix @@ -6,4 +6,7 @@ }; imports = [ nixos-cosmic.nixosModules.default ]; + + services.desktopManager.cosmic.enable = true; + services.displayManager.cosmic-greeter.enable = true; } diff --git a/hosts/gpdPocket3/configuration.nix b/hosts/gpdPocket3/configuration.nix index 056c534..2604a86 100644 --- a/hosts/gpdPocket3/configuration.nix +++ b/hosts/gpdPocket3/configuration.nix @@ -13,10 +13,10 @@ (settings.hostsDir + "/_common/components/ssh.nix") (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix") (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix") - (settings.hostsDir + "/_common/components/audio.nix") + # (settings.hostsDir + "/_common/components/audio.nix") (settings.hostsDir + "/_common/components/home_manager.nix") - (settings.hostsDir + "/_common/components/gnome_wayland.nix") - # (settings.hostsDir + "/_common/components/cosmic.nix") + # (settings.hostsDir + "/_common/components/gnome_wayland.nix") + (settings.hostsDir + "/_common/components/cosmic.nix") (settings.hostsDir + "/_common/components/docker.nix") (settings.hostsDir + "/_common/components/nebula.nix") # Users this machine has diff --git a/users/_common/components/home_manager/tmux/tmux.nix b/users/_common/components/home_manager/tmux/tmux.nix index 5ca7e2b..566b10c 100644 --- a/users/_common/components/home_manager/tmux/tmux.nix +++ b/users/_common/components/home_manager/tmux/tmux.nix @@ -26,7 +26,7 @@ src = pkgs.fetchgit { url = "https://git.joshuabell.xyz/tmux-catppuccin-coal.git"; rev = "d078123cd81c0dbb3f780e8575a9d38fe2023e1b"; - sha256 = "sha256-M1XAeCz/lqgjZ7CnWCykJxZCDk+WVoawwHrR9SEO9ns="; + sha256 = "sha256-qPY/dovDyut5WoUkZ26F2w3fJVmw4gcC+6l2ugsA65Y="; }; }); extraConfig = ''