making build not actually build cosmic things

This commit is contained in:
Chris Cochrun 2024-12-05 14:14:23 -06:00
parent 683463ec50
commit 3626b8f902
8 changed files with 44 additions and 23 deletions

View file

@ -2138,7 +2138,7 @@ c.url.searchengines = {
"DEFAULT": "https://search.tfcconnection.org/?q={}", "DEFAULT": "https://search.tfcconnection.org/?q={}",
"yt": "https://yewtu.be/search?q={}", "yt": "https://yewtu.be/search?q={}",
"mel": "https://melpa.org/#/?q={}", "mel": "https://melpa.org/#/?q={}",
"y": "https://www.youtube.com/results?search_query={}", "y": "https://inv.cochrun.xyz/search?q={}",
"ama": "https://smile.amazon.com/s?k={}", "ama": "https://smile.amazon.com/s?k={}",
"aur": "https://aur.archlinux.org/packages/?O=0&K={}", "aur": "https://aur.archlinux.org/packages/?O=0&K={}",
"od": "https://odysee.com/$/search?q={}", "od": "https://odysee.com/$/search?q={}",

View file

@ -394,9 +394,7 @@
"nixos-cosmic": { "nixos-cosmic": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nixpkgs": [ "nixpkgs": "nixpkgs_2",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
@ -527,15 +525,15 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1733212471, "lastModified": 1732837521,
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -620,7 +618,10 @@
"nix-bitcoin": "nix-bitcoin", "nix-bitcoin": "nix-bitcoin",
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": [
"nixos-cosmic",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-stable": "nixpkgs-stable_3",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
"quickemu": "quickemu", "quickemu": "quickemu",
@ -711,11 +712,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1733262405, "lastModified": 1733427445,
"narHash": "sha256-/AT315It87ll6mlZLYcmfoe6Uogx9MjPBCCZZZTq8xY=", "narHash": "sha256-E854RAbAX+DZHDo4HIk2nkqpIvvoAm+P7oDx7TmhWk8=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "ffba1f1bab63ea49541f812c72a4fcf305461d67", "rev": "eb918dbffa24c4dae497f3ce3173660f948d5237",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -3,6 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.follows = "nixos-cosmic/nixpkgs";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {
@ -46,7 +47,6 @@
}; };
nixos-cosmic = { nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic"; url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
}; };
# rust-overlay = { # rust-overlay = {
# url = "github:oxalica/rust-overlay"; # url = "github:oxalica/rust-overlay";

View file

@ -73,7 +73,7 @@ in
"video/H265" = "mpv.desktop"; "video/H265" = "mpv.desktop";
"video/H264" = "mpv.desktop"; "video/H264" = "mpv.desktop";
"video/vnd.youtube.yt" = "mpv.desktop"; "video/vnd.youtube.yt" = "mpv.desktop";
"inode/directory" = "cosmic-files"; "inode/directory" = "dolphin.desktop";
"image/gif" = "imv-rifle.desktop"; "image/gif" = "imv-rifle.desktop";
"image/jpeg" = "imv-rifle.desktop"; "image/jpeg" = "imv-rifle.desktop";
"image/heif" = "imv-rifle.desktop"; "image/heif" = "imv-rifle.desktop";
@ -105,7 +105,7 @@ in
"video/H265" = "mpv.desktop"; "video/H265" = "mpv.desktop";
"video/H264" = "mpv.desktop"; "video/H264" = "mpv.desktop";
"video/vnd.youtube.yt" = "mpv.desktop"; "video/vnd.youtube.yt" = "mpv.desktop";
"inode/directory" = "cosmic-files"; "inode/directory" = "dolphin.desktop";
"image/gif" = "imv-rifle.desktop"; "image/gif" = "imv-rifle.desktop";
"image/jpeg" = "imv-rifle.desktop"; "image/jpeg" = "imv-rifle.desktop";
"image/heif" = "imv-rifle.desktop"; "image/heif" = "imv-rifle.desktop";

View file

@ -29,7 +29,7 @@
boot.supportedFilesystems = [ "ntfs" ]; boot.supportedFilesystems = [ "ntfs" ];
services = { services = {
desktopManager.cosmic.enable = true; desktopManager.cosmic.enable = false;
}; };
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
@ -64,11 +64,30 @@
}; };
services.displayManager.cosmic-greeter = { services.displayManager.cosmic-greeter = {
enable = true; enable = false;
}; };
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = rec {
initial_session = {
command = "dbus-run-session Hyprland";
# command = "dbus-run-session startplasma-wayland";
user = "chris";
};
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session Hyprland' -s /etc/greetd/environments";
user = "greeter";
};
plasma_session = {
command = "dbus-run-session startplasma-wayland";
user = "chris";
};
hyprland_session = {
command = "Hyprland";
user = "chris";
};
};
}; };
programs.regreet = { enable = true; }; programs.regreet = { enable = true; };

View file

@ -63,10 +63,10 @@
du-dust du-dust
sbcl sbcl
clojure # clojure
clojure-lsp # clojure-lsp
clj-kondo # clj-kondo
leiningen # leiningen
]; ];
} }

View file

@ -143,6 +143,6 @@
esphome esphome
esptool esptool
wireguard-tools wireguard-tools
cosmic-ext-examine # cosmic-ext-examine
]; ];
} }

View file

@ -4,6 +4,7 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../cachix/default.nix
../../pkgs/base-packages.nix ../../pkgs/base-packages.nix
../../pkgs/desktop-packages.nix ../../pkgs/desktop-packages.nix
../../modules/emacs.nix ../../modules/emacs.nix