From 3626b8f9021b91f0f9f89bdeed04b90fda64caf9 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 5 Dec 2024 14:14:23 -0600 Subject: [PATCH] making build not actually build cosmic things --- .config/qutebrowser/config.py | 2 +- flake.lock | 25 +++++++++++++------------ flake.nix | 2 +- home/home.nix | 4 ++-- modules/desktop.nix | 23 +++++++++++++++++++++-- pkgs/base-packages.nix | 8 ++++---- pkgs/desktop-packages.nix | 2 +- systems/kaladin/configuration.nix | 1 + 8 files changed, 44 insertions(+), 23 deletions(-) diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index 18de71c..b11907c 100644 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -2138,7 +2138,7 @@ c.url.searchengines = { "DEFAULT": "https://search.tfcconnection.org/?q={}", "yt": "https://yewtu.be/search?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={}", "aur": "https://aur.archlinux.org/packages/?O=0&K={}", "od": "https://odysee.com/$/search?q={}", diff --git a/flake.lock b/flake.lock index e1d5ad3..bd133c2 100644 --- a/flake.lock +++ b/flake.lock @@ -394,9 +394,7 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2" }, @@ -527,15 +525,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", - "owner": "nixos", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -620,7 +618,10 @@ "nix-bitcoin": "nix-bitcoin", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable_3", "plasma-manager": "plasma-manager", "quickemu": "quickemu", @@ -711,11 +712,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1733262405, - "narHash": "sha256-/AT315It87ll6mlZLYcmfoe6Uogx9MjPBCCZZZTq8xY=", + "lastModified": 1733427445, + "narHash": "sha256-E854RAbAX+DZHDo4HIk2nkqpIvvoAm+P7oDx7TmhWk8=", "owner": "danth", "repo": "stylix", - "rev": "ffba1f1bab63ea49541f812c72a4fcf305461d67", + "rev": "eb918dbffa24c4dae497f3ce3173660f948d5237", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5aba422..5c159a0 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.follows = "nixos-cosmic/nixpkgs"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { @@ -46,7 +47,6 @@ }; nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; }; # rust-overlay = { # url = "github:oxalica/rust-overlay"; diff --git a/home/home.nix b/home/home.nix index ff219eb..91a2d4f 100644 --- a/home/home.nix +++ b/home/home.nix @@ -73,7 +73,7 @@ in "video/H265" = "mpv.desktop"; "video/H264" = "mpv.desktop"; "video/vnd.youtube.yt" = "mpv.desktop"; - "inode/directory" = "cosmic-files"; + "inode/directory" = "dolphin.desktop"; "image/gif" = "imv-rifle.desktop"; "image/jpeg" = "imv-rifle.desktop"; "image/heif" = "imv-rifle.desktop"; @@ -105,7 +105,7 @@ in "video/H265" = "mpv.desktop"; "video/H264" = "mpv.desktop"; "video/vnd.youtube.yt" = "mpv.desktop"; - "inode/directory" = "cosmic-files"; + "inode/directory" = "dolphin.desktop"; "image/gif" = "imv-rifle.desktop"; "image/jpeg" = "imv-rifle.desktop"; "image/heif" = "imv-rifle.desktop"; diff --git a/modules/desktop.nix b/modules/desktop.nix index 8fe22b8..ce5fbfb 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -29,7 +29,7 @@ boot.supportedFilesystems = [ "ntfs" ]; services = { - desktopManager.cosmic.enable = true; + desktopManager.cosmic.enable = false; }; programs.nix-ld.enable = true; @@ -64,11 +64,30 @@ }; services.displayManager.cosmic-greeter = { - enable = true; + enable = false; }; services.greetd = { 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; }; diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index b0078e7..8faacf3 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -63,10 +63,10 @@ du-dust sbcl - clojure - clojure-lsp - clj-kondo - leiningen + # clojure + # clojure-lsp + # clj-kondo + # leiningen ]; } diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index a3e787c..2d156d7 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -143,6 +143,6 @@ esphome esptool wireguard-tools - cosmic-ext-examine + # cosmic-ext-examine ]; } diff --git a/systems/kaladin/configuration.nix b/systems/kaladin/configuration.nix index e759622..56a0736 100644 --- a/systems/kaladin/configuration.nix +++ b/systems/kaladin/configuration.nix @@ -4,6 +4,7 @@ imports = [ ./hardware-configuration.nix + ../../cachix/default.nix ../../pkgs/base-packages.nix ../../pkgs/desktop-packages.nix ../../modules/emacs.nix