diff --git a/flake.lock b/flake.lock index db447fc9..a3fccad2 100644 --- a/flake.lock +++ b/flake.lock @@ -6,17 +6,17 @@ "emacs-overlay": "emacs-overlay" }, "locked": { - "lastModified": 1690289105, - "narHash": "sha256-6KPgZZvASFElzMiuIYd7hHvdhMfBz7tSpIUER2U2W9E=", + "lastModified": 1690297243, + "narHash": "sha256-ExZs7PnEqzXZHZaJN/G9OVR1u95/wPRsY+xXr36hI3c=", "ref": "refs/heads/main", - "rev": "dafb71e7d7f856ac3a72368417ddc14189fc575f", - "revCount": 1, + "rev": "8174c06eb53083658b2b72ca9e82201ceba3d54e", + "revCount": 5, "type": "git", - "url": "file:///home/elitherl/.config/doom" + "url": "https://git.xenia.me.uk/xenia/emacs.git" }, "original": { "type": "git", - "url": "file:///home/elitherl/.config/doom" + "url": "https://git.xenia.me.uk/xenia/emacs.git" } }, "doom-emacs_2": { @@ -55,85 +55,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "neovim-custom", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "neovim-custom", - "neovim-nightly-overlay", - "hercules-ci-effects", - "hercules-ci-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -152,83 +73,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "haskell-flake": { - "locked": { - "lastModified": 1684780604, - "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "0.3.0", - "repo": "haskell-flake", - "type": "github" - } - }, - "hercules-ci-agent": { - "inputs": { - "flake-parts": "flake-parts_3", - "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1688568579, - "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=", - "owner": "hercules-ci", - "repo": "hercules-ci-agent", - "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5", - "type": "github" - }, - "original": { - "id": "hercules-ci-agent", - "type": "indirect" - } - }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_2", - "hercules-ci-agent": "hercules-ci-agent", - "nixpkgs": [ - "neovim-custom", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1689397210, - "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -293,75 +137,6 @@ "type": "github" } }, - "neovim-custom": { - "inputs": { - "neovim-nightly-overlay": "neovim-nightly-overlay", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1690191730, - "narHash": "sha256-jaigjILRn7hU75nsRn7qqqqtD6vHpgT56inwOuYDImI=", - "ref": "refs/heads/main", - "rev": "01ea9bc452dd58e6071fa02b2e05ff6e8d3547c7", - "revCount": 114, - "type": "git", - "url": "https://git.xenia.me.uk/xenia/nvim.git" - }, - "original": { - "type": "git", - "url": "https://git.xenia.me.uk/xenia/nvim.git" - } - }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "neovim-custom", - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1689836628, - "narHash": "sha256-CDbbn0N6eiknKa4KrYc6+4LAb4za2IYSw/YGy5BPdcQ=", - "owner": "neovim", - "repo": "neovim", - "rev": "63b3408551561127f7845470eb51404bcd6f547b", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake", - "nixpkgs": [ - "neovim-custom", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1689897867, - "narHash": "sha256-qr3jIEZh6k83i5JBfJ1GuwSTybekrioSnd3iaZACr5g=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "258dfdf8fec67a1cea88a71d7613584300e062a0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1690031011, @@ -378,24 +153,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1690148897, @@ -413,38 +170,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1688322751, - "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1690031011, - "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "12303c652b881435065a98729eb7278313041e49", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1690179384, "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", @@ -465,8 +190,7 @@ "doom-emacs": "doom-emacs", "home-manager": "home-manager", "hyprland": "hyprland", - "neovim-custom": "neovim-custom", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "tokyonight": "tokyonight", "wallpapers": "wallpapers" } @@ -486,21 +210,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tokyonight": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 3aa6e5c2..b6440758 100644 --- a/flake.nix +++ b/flake.nix @@ -11,125 +11,103 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; - doom-emacs.url = "/home/elitherl/.config/doom"; + doom-emacs.url = "git+https://git.xenia.me.uk/xenia/emacs.git"; wallpapers.url = "git+https://git.xenia.me.uk/xenia/wallpapers.git"; - neovim-custom.url = "git+https://git.xenia.me.uk/xenia/nvim.git"; tokyonight = { url = "github:folke/tokyonight.nvim"; flake = false; }; }; - outputs = { - self, - nixpkgs, - home-manager, - hyprland, - doom-emacs, - wallpapers, - neovim-custom, - tokyonight, - }: let - shell = "zsh"; - in { - nixosConfigurations = let - userConfig = { - isNormalUser = true; - description = "Evie Litherland-Smith"; - group = "users"; - extraGroups = ["networkmanager" "wheel" "video"]; - shell = pkgs.${shell}; - openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix; - }; - specialArgs = {inherit shell userConfig hyprland;}; - waybar-experimental-overlay = final: prev: { - waybar = prev.waybar.overrideAttrs (oldAttrs: { - mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; - }); - }; - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - overlays = [ - waybar-experimental-overlay - doom-emacs.outputs.overlay.default - neovim-custom.outputs.overlay - ]; - }; + outputs = { self, nixpkgs, home-manager, hyprland, doom-emacs, wallpapers + , tokyonight, }: + let shell = "zsh"; in { - Legion = let - hostname = "Legion"; - in - nixpkgs.lib.nixosSystem { - inherit pkgs specialArgs; - modules = [./hosts/${hostname}/configuration.nix]; + nixosConfigurations = let + userConfig = { + isNormalUser = true; + description = "Evie Litherland-Smith"; + group = "users"; + extraGroups = [ "networkmanager" "wheel" "video" ]; + shell = pkgs.${shell}; + openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix; }; - Vanguard = let - hostname = "Vanguard"; - in - nixpkgs.lib.nixosSystem { - inherit pkgs specialArgs; - modules = [ - ./hosts/${hostname}/configuration.nix - doom-emacs.outputs.nixosModules - ]; + specialArgs = { inherit shell userConfig hyprland; }; + waybar-experimental-overlay = final: prev: { + waybar = prev.waybar.overrideAttrs (oldAttrs: { + mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; + }); }; - Ronin = let - hostname = "Ronin"; - in - nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + overlays = + [ waybar-experimental-overlay doom-emacs.outputs.overlay.default ]; + }; + in { + Legion = let hostname = "Legion"; + in nixpkgs.lib.nixosSystem { + inherit pkgs specialArgs; + modules = [ ./hosts/${hostname}/configuration.nix ]; + }; + Vanguard = let hostname = "Vanguard"; + in nixpkgs.lib.nixosSystem { + inherit pkgs specialArgs; + modules = [ + ./hosts/${hostname}/configuration.nix + doom-emacs.outputs.nixosModules.default + ]; + }; + Ronin = let hostname = "Ronin"; + in nixpkgs.lib.nixosSystem { inherit pkgs specialArgs; modules = [ ./hosts/${hostname}/configuration.nix doom-emacs.outputs.nixosModules.default ]; }; - }; - homeConfigurations = let - extraSpecialArgs = { - inherit hyprland wallpapers neovim-custom tokyonight; - shellConfig = ./home/shell/${shell}.nix; }; - in { - # NixOS home configurations - "xenia@Vanguard" = let - hostname = "Vanguard"; - pkgs = self.nixosConfigurations.${hostname}.pkgs; - in - home-manager.lib.homeManagerConfiguration { - inherit pkgs extraSpecialArgs; - modules = [./hosts/${hostname}/home.nix]; + homeConfigurations = let + extraSpecialArgs = { + inherit hyprland wallpapers tokyonight; + shellConfig = ./home/shell/${shell}.nix; }; - "xenia@Legion" = let - hostname = "Legion"; - pkgs = self.nixosConfigurations.${hostname}.pkgs; - in - home-manager.lib.homeManagerConfiguration { + in { + # NixOS home configurations + "xenia@Vanguard" = let + hostname = "Vanguard"; + pkgs = self.nixosConfigurations.${hostname}.pkgs; + in home-manager.lib.homeManagerConfiguration { inherit pkgs extraSpecialArgs; - modules = [./hosts/${hostname}/home.nix]; + modules = [ ./hosts/${hostname}/home.nix ]; }; - "elitherl@Ronin" = let - hostname = "Ronin"; - pkgs = self.nixosConfigurations.${hostname}.pkgs; - in - home-manager.lib.homeManagerConfiguration { + "xenia@Legion" = let + hostname = "Legion"; + pkgs = self.nixosConfigurations.${hostname}.pkgs; + in home-manager.lib.homeManagerConfiguration { + inherit pkgs extraSpecialArgs; + modules = [ ./hosts/${hostname}/home.nix ]; + }; + "elitherl@Ronin" = let + hostname = "Ronin"; + pkgs = self.nixosConfigurations.${hostname}.pkgs; + in home-manager.lib.homeManagerConfiguration { inherit pkgs extraSpecialArgs; modules = [ ./hosts/${hostname}/home.nix doom-emacs.outputs.homeManagerModules.default ]; }; - # Legacy home configurations - "tux@Monarch" = let - hostname = "Monarch"; - system = "aarch64-darwin"; - pkgs = nixpkgs.legacyPackages.${system}; - in - home-manager.lib.homeManagerConfiguration { + # Legacy home configurations + "tux@Monarch" = let + hostname = "Monarch"; + system = "aarch64-darwin"; + pkgs = nixpkgs.legacyPackages.${system}; + in home-manager.lib.homeManagerConfiguration { inherit pkgs extraSpecialArgs; - modules = [./hosts/${hostname}/home.nix]; + modules = [ ./hosts/${hostname}/home.nix ]; }; + }; }; - }; } diff --git a/home/firefox/work.nix b/home/firefox/work.nix index 8454d9ee..ee04acc3 100644 --- a/home/firefox/work.nix +++ b/home/firefox/work.nix @@ -3,7 +3,6 @@ programs.firefox.profiles.default = { settings = { "browser.startup.homepage" = "https://nucleus.ukaea.uk"; - "general.useragent.override" = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36"; }; search.engines."JET Pulse" = { urls = [{template = "https://data.jet.uk/dashboard/pulses/{searchTerms}/overview";}]; diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix index 4ebba319..7725a17e 100644 --- a/hosts/Ronin/home.nix +++ b/hosts/Ronin/home.nix @@ -1,8 +1,5 @@ -{ - pkgs, - shellConfig, - ... -}: let +{ pkgs, shellConfig, ... }: +let username = "elitherl"; homeDirectory = "/home/${username}"; monitors = { @@ -17,25 +14,23 @@ in { ../../home/ssh/work.nix ../../home/tui ../../home/hyprland - ../../home/firefox/work.nix ../../home/wezterm ]; home = { inherit username homeDirectory; stateVersion = "22.11"; - packages = with pkgs; [openfortivpn nomachine-client]; + packages = with pkgs; [ openfortivpn nomachine-client ]; }; programs.home-manager.enable = true; + programs.chromium.enable = true; services.kanshi = { enable = true; systemdTarget = "hyprland-session.target"; profiles = { - undocked.outputs = [ - { - criteria = "eDP-1"; - status = "enable"; - } - ]; + undocked.outputs = [{ + criteria = "eDP-1"; + status = "enable"; + }]; docked.outputs = [ { criteria = "eDP-1";