cosmic working ish, bad performance
This commit is contained in:
parent
86a2c97bd8
commit
cb65d7c49c
5 changed files with 123 additions and 20 deletions
121
flake.lock
generated
121
flake.lock
generated
|
@ -62,6 +62,22 @@
|
||||||
"type": "github"
|
"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": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
|
@ -213,23 +229,60 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixos-cosmic": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat",
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
|
"rust-overlay": "rust-overlay"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728001490,
|
"lastModified": 1728443929,
|
||||||
"narHash": "sha256-jyLDB1hREFhujapdfZNOyFGQ2+FlhsnhCBYa9YBWn+4=",
|
"narHash": "sha256-WFy8+K/bUTXwT9nMPT/Y23dPbW5I2rLEjgTuPC8y3lA=",
|
||||||
"owner": "nixos",
|
"owner": "lilyinstarlight",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixos-cosmic",
|
||||||
"rev": "52cfd83eee767c5d02089efe79c4811ffc52a046",
|
"rev": "a8960f9c66a0c4f2c24ae029da0886df4a68af33",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "lilyinstarlight",
|
||||||
"ref": "master",
|
"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",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"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": {
|
"locked": {
|
||||||
"lastModified": 1727907660,
|
"lastModified": 1727907660,
|
||||||
"narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
|
"narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
|
||||||
|
@ -245,6 +298,22 @@
|
||||||
"type": "github"
|
"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": {
|
"nixpkgs_stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728328465,
|
"lastModified": 1728328465,
|
||||||
|
@ -1009,7 +1078,7 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs_stable"
|
"nixpkgs_stable"
|
||||||
],
|
],
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726755133,
|
"lastModified": 1726755133,
|
||||||
|
@ -1027,8 +1096,8 @@
|
||||||
},
|
},
|
||||||
"ringofstorms-nvim": {
|
"ringofstorms-nvim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||||
"nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
|
"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-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",
|
||||||
"nvim_plugin-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip",
|
"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-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag",
|
||||||
"nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp",
|
"nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp",
|
||||||
"nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua",
|
"nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua",
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1728010640,
|
"lastModified": 1728010640,
|
||||||
|
@ -1083,11 +1152,11 @@
|
||||||
"rev": "4032e16f3b9fc2ceeccb72807ee2b8b47839a475",
|
"rev": "4032e16f3b9fc2ceeccb72807ee2b8b47839a475",
|
||||||
"revCount": 206,
|
"revCount": 206,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git.joshuabell.xyz:3032/nvim"
|
"url": "https://git.joshuabell.xyz/nvim"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git.joshuabell.xyz:3032/nvim"
|
"url": "https://git.joshuabell.xyz/nvim"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
@ -1098,6 +1167,7 @@
|
||||||
"h002_nixpkgs": "h002_nixpkgs",
|
"h002_nixpkgs": "h002_nixpkgs",
|
||||||
"joe_home-manager": "joe_home-manager",
|
"joe_home-manager": "joe_home-manager",
|
||||||
"joe_nixpkgs": "joe_nixpkgs",
|
"joe_nixpkgs": "joe_nixpkgs",
|
||||||
|
"nixos-cosmic": "nixos-cosmic",
|
||||||
"nixpkgs_stable": "nixpkgs_stable",
|
"nixpkgs_stable": "nixpkgs_stable",
|
||||||
"nypkgs": "nypkgs",
|
"nypkgs": "nypkgs",
|
||||||
"ragenix": "ragenix",
|
"ragenix": "ragenix",
|
||||||
|
@ -1105,6 +1175,27 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"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": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"ragenix",
|
"ragenix",
|
||||||
|
@ -1125,7 +1216,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay_2": {
|
"rust-overlay_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"ringofstorms-nvim",
|
"ringofstorms-nvim",
|
||||||
|
|
11
flake.nix
11
flake.nix
|
@ -128,7 +128,16 @@
|
||||||
"${nixConfig.name}" =
|
"${nixConfig.name}" =
|
||||||
nixConfig.settings.nixpkgs.lib.nixosSystem {
|
nixConfig.settings.nixpkgs.lib.nixosSystem {
|
||||||
# module = nixConfig.overrides.modules or [...]
|
# 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 // {
|
specialArgs = inputs // {
|
||||||
ylib = nypkgs.legacyPackages.${nixConfig.opts.system}.lib;
|
ylib = nypkgs.legacyPackages.${nixConfig.opts.system}.lib;
|
||||||
settings =
|
settings =
|
||||||
|
|
|
@ -6,4 +6,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
imports = [ nixos-cosmic.nixosModules.default ];
|
imports = [ nixos-cosmic.nixosModules.default ];
|
||||||
|
|
||||||
|
services.desktopManager.cosmic.enable = true;
|
||||||
|
services.displayManager.cosmic-greeter.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,10 +13,10 @@
|
||||||
(settings.hostsDir + "/_common/components/ssh.nix")
|
(settings.hostsDir + "/_common/components/ssh.nix")
|
||||||
(settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
|
(settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
|
||||||
(settings.hostsDir + "/_common/components/font_jetbrainsmono.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/home_manager.nix")
|
||||||
(settings.hostsDir + "/_common/components/gnome_wayland.nix")
|
# (settings.hostsDir + "/_common/components/gnome_wayland.nix")
|
||||||
# (settings.hostsDir + "/_common/components/cosmic.nix")
|
(settings.hostsDir + "/_common/components/cosmic.nix")
|
||||||
(settings.hostsDir + "/_common/components/docker.nix")
|
(settings.hostsDir + "/_common/components/docker.nix")
|
||||||
(settings.hostsDir + "/_common/components/nebula.nix")
|
(settings.hostsDir + "/_common/components/nebula.nix")
|
||||||
# Users this machine has
|
# Users this machine has
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://git.joshuabell.xyz/tmux-catppuccin-coal.git";
|
url = "https://git.joshuabell.xyz/tmux-catppuccin-coal.git";
|
||||||
rev = "d078123cd81c0dbb3f780e8575a9d38fe2023e1b";
|
rev = "d078123cd81c0dbb3f780e8575a9d38fe2023e1b";
|
||||||
sha256 = "sha256-M1XAeCz/lqgjZ7CnWCykJxZCDk+WVoawwHrR9SEO9ns=";
|
sha256 = "sha256-qPY/dovDyut5WoUkZ26F2w3fJVmw4gcC+6l2ugsA65Y=";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue