Lots more theming

Switch remaining catppuccin to tokyonight, using stylix to generate GTK
theme now

Switch SDDM for LightDM (uses stylix theme), enable plymouth boot
splashscreen

Make Hyprland window rules (not launch binds) silent now
This commit is contained in:
Evie Litherland-Smith 2023-10-14 20:49:30 +01:00
parent 7eee09dcd2
commit 2a42c14fb5
13 changed files with 536 additions and 365 deletions

View file

@ -73,10 +73,3 @@ Register app-password with gnome-keyring;
#+begin_src bash #+begin_src bash
secret-tool store --label="NextCloud" url cloud.xenia.me.uk secret-tool store --label="NextCloud" url cloud.xenia.me.uk
#+end_src #+end_src
* Midnight Commander
Instructions from [[https://github.com/catppuccin/mc][GitHub - catppuccin/mc: 🌜 Soothing pastel theme for Midnight Commander]]:
#+begin_src bash
mkdir -p $HOME/.local/share/mc/skins && cd $HOME/.local/share/mc/skins && git clone https://github.com/catppuccin/mc.git && ln -s -f ./mc/catppuccin.ini .
#+end_src
Then set theme in src_bash[mc]{mc} F9 appearance menu.

View file

@ -39,179 +39,98 @@
"type": "github" "type": "github"
} }
}, },
"catppuccin-alacritty": { "blank": {
"flake": false,
"locked": { "locked": {
"lastModified": 1664239314, "lastModified": 1625557891,
"narHash": "sha256-w9XVtEe7TqzxxGUCDUR9BFkzLZjG8XrplXJ3lX6f+x0=", "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=",
"owner": "catppuccin", "owner": "divnix",
"repo": "alacritty", "repo": "blank",
"rev": "3c808cbb4f9c87be43ba5241bc57373c793d2f17", "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "catppuccin", "owner": "divnix",
"repo": "alacritty", "repo": "blank",
"type": "github" "type": "github"
} }
}, },
"catppuccin-base16": { "crane": {
"flake": false, "inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"watershot",
"std",
"paisano-mdbook-preprocessor",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": { "locked": {
"lastModified": 1665586920, "lastModified": 1676162383,
"narHash": "sha256-fZDsmJ+xFjOJDoI+bPki9W7PEI5lT5aGoCYtkatcZ8A=", "narHash": "sha256-krUCKdz7ebHlFYm/A7IbKDnj2ZmMMm3yIEQcooqm7+E=",
"owner": "catppuccin", "owner": "ipetkov",
"repo": "base16", "repo": "crane",
"rev": "ca74b4070d6ead4213e92da1273fcc1853de7af8", "rev": "6fb400ec631b22ccdbc7090b38207f7fb5cfb5f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "catppuccin", "owner": "ipetkov",
"repo": "base16", "repo": "crane",
"type": "github" "type": "github"
} }
}, },
"catppuccin-bat": { "devshell": {
"flake": false, "inputs": {
"flake-utils": [
"watershot",
"std",
"flake-utils"
],
"nixpkgs": [
"watershot",
"std",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1668065083, "lastModified": 1682700442,
"narHash": "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=", "narHash": "sha256-qjaAAcCYgp1pBBG7mY9z95ODUBZMtUpf0Qp3Gt/Wha0=",
"owner": "catppuccin", "owner": "numtide",
"repo": "bat", "repo": "devshell",
"rev": "ba4d16880d63e656acced2b7d4e034e4a93f74b1", "rev": "fb6673fe9fe4409e3f43ca86968261e970918a83",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "catppuccin", "owner": "numtide",
"repo": "bat", "repo": "devshell",
"type": "github" "type": "github"
} }
}, },
"catppuccin-fish": { "dmerge": {
"flake": false, "inputs": {
"nixlib": [
"watershot",
"std",
"nixpkgs"
],
"yants": [
"watershot",
"std",
"yants"
]
},
"locked": { "locked": {
"lastModified": 1682585691, "lastModified": 1659548052,
"narHash": "sha256-l9V7YMfJWhKDL65dNbxaddhaM6GJ0CFZ6z+4R6MJwBA=", "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=",
"owner": "catppuccin", "owner": "divnix",
"repo": "fish", "repo": "data-merge",
"rev": "91e6d6721362be05a5c62e235ed8517d90c567c9", "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "catppuccin", "owner": "divnix",
"repo": "fish", "repo": "data-merge",
"type": "github"
}
},
"catppuccin-gitui": {
"flake": false,
"locked": {
"lastModified": 1687370019,
"narHash": "sha256-m6Tjch6A2ZPZ3/muvb/9sEAQUZfjnWqcwyhNVeqPS2c=",
"owner": "catppuccin",
"repo": "gitui",
"rev": "3c97c7af7247b1e0f4366a4d8fab650bcce54100",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "gitui",
"type": "github"
}
},
"catppuccin-hyprland": {
"flake": false,
"locked": {
"lastModified": 1683122293,
"narHash": "sha256-07B5QmQmsUKYf38oWU3+2C6KO4JvinuTwmW1Pfk8CT8=",
"owner": "catppuccin",
"repo": "hyprland",
"rev": "99a88fd21fac270bd999d4a26cf0f4a4222c58be",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "hyprland",
"type": "github"
}
},
"catppuccin-prismlauncher": {
"flake": false,
"locked": {
"lastModified": 1682275027,
"narHash": "sha256-07QyiXEZDgrj6UlPZe1112DLOhYJ6zQ2ygeowJPj2ac=",
"owner": "catppuccin",
"repo": "prismlauncher",
"rev": "f0a3044558fe22020e0b0ddef0e3b2ef93e4ed89",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "prismlauncher",
"type": "github"
}
},
"catppuccin-qbittorrent": {
"flake": false,
"locked": {
"lastModified": 1674761875,
"narHash": "sha256-j9QqhT5oiYZp7CJVZmUvJvwtoKNYAxJKmzLpy8KsCZs=",
"owner": "catppuccin",
"repo": "qbittorrent",
"rev": "c2fa170731a17644a6f93d4d8fc4614426488c62",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "qbittorrent",
"type": "github"
}
},
"catppuccin-starship": {
"flake": false,
"locked": {
"lastModified": 1689246850,
"narHash": "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=",
"owner": "catppuccin",
"repo": "starship",
"rev": "5629d2356f62a9f2f8efad3ff37476c19969bd4f",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "starship",
"type": "github"
}
},
"catppuccin-zathura": {
"flake": false,
"locked": {
"lastModified": 1664239314,
"narHash": "sha256-5Vh2bVabuBluVCJm9vfdnjnk32CtsK7wGIWM5+XnacM=",
"owner": "catppuccin",
"repo": "zathura",
"rev": "d85d8750acd0b0247aa10e0653998180391110a4",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "zathura",
"type": "github"
}
},
"catppuccin-zsh": {
"flake": false,
"locked": {
"lastModified": 1665638423,
"narHash": "sha256-Q7KmwUd9fblprL55W0Sf4g7lRcemnhjh4/v+TacJSfo=",
"owner": "catppuccin",
"repo": "zsh-syntax-highlighting",
"rev": "06d519c20798f0ebe275fc3a8101841faaeee8ea",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "zsh-syntax-highlighting",
"type": "github" "type": "github"
} }
}, },
@ -231,6 +150,25 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": "nixpkgs_2",
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1677306201,
"narHash": "sha256-VZ9x7qdTosFvVsrpgFHrtYfT6PU3yMIs7NRYn9ELapI=",
"owner": "nix-community",
"repo": "fenix",
"rev": "0923f0c162f65ae40261ec940406049726cfeab4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -247,6 +185,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"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": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -268,6 +222,36 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -341,6 +325,87 @@
"type": "github" "type": "github"
} }
}, },
"incl": {
"inputs": {
"nixlib": [
"watershot",
"std",
"nixpkgs"
]
},
"locked": {
"lastModified": 1669263024,
"narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=",
"owner": "divnix",
"repo": "incl",
"rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca",
"type": "github"
},
"original": {
"owner": "divnix",
"repo": "incl",
"type": "github"
}
},
"n2c": {
"inputs": {
"flake-utils": [
"watershot",
"std",
"flake-utils"
],
"nixpkgs": [
"watershot",
"std",
"nixpkgs"
]
},
"locked": {
"lastModified": 1677330646,
"narHash": "sha256-hUYCwJneMjnxTvj30Fjow6UMJUITqHlpUGpXMPXUJsU=",
"owner": "nlewo",
"repo": "nix2container",
"rev": "ebca8f58d450cae1a19c07701a5a8ae40afc9efc",
"type": "github"
},
"original": {
"owner": "nlewo",
"repo": "nix2container",
"type": "github"
}
},
"nixago": {
"inputs": {
"flake-utils": [
"watershot",
"std",
"flake-utils"
],
"nixago-exts": [
"watershot",
"std",
"blank"
],
"nixpkgs": [
"watershot",
"std",
"nixpkgs"
]
},
"locked": {
"lastModified": 1683210100,
"narHash": "sha256-bhGDOlkWtlhVECpoOog4fWiFJmLCpVEg09a40aTjCbw=",
"owner": "nix-community",
"repo": "nixago",
"rev": "1da60ad9412135f9ed7a004669fdcf3d378ec630",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixago",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694422566, "lastModified": 1694422566,
@ -357,26 +422,249 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1677063315,
"narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nosys": {
"locked": {
"lastModified": 1668010795,
"narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=",
"owner": "divnix",
"repo": "nosys",
"rev": "feade0141487801c71ff55623b421ed535dbdefa",
"type": "github"
},
"original": {
"owner": "divnix",
"repo": "nosys",
"type": "github"
}
},
"paisano": {
"inputs": {
"nixpkgs": [
"watershot",
"std",
"nixpkgs"
],
"nosys": "nosys",
"yants": [
"watershot",
"std",
"yants"
]
},
"locked": {
"lastModified": 1678949904,
"narHash": "sha256-oAoF66hYYz1RPh3lEwb9/4e4iyBAfTbQKZRRQ8gP0Ds=",
"owner": "paisano-nix",
"repo": "core",
"rev": "88f2aff10a5064551d1d4cb86800d17084489ce3",
"type": "github"
},
"original": {
"owner": "paisano-nix",
"repo": "core",
"type": "github"
}
},
"paisano-actions": {
"inputs": {
"nixpkgs": [
"watershot",
"std",
"paisano-mdbook-preprocessor",
"nixpkgs"
]
},
"locked": {
"lastModified": 1677306424,
"narHash": "sha256-H9/dI2rGEbKo4KEisqbRPHFG2ajF8Tm111NPdKGIf28=",
"owner": "paisano-nix",
"repo": "actions",
"rev": "65ec4e080b3480167fc1a748c89a05901eea9a9b",
"type": "github"
},
"original": {
"owner": "paisano-nix",
"repo": "actions",
"type": "github"
}
},
"paisano-mdbook-preprocessor": {
"inputs": {
"crane": "crane",
"fenix": "fenix",
"nixpkgs": [
"watershot",
"std",
"nixpkgs"
],
"paisano-actions": "paisano-actions",
"std": [
"watershot",
"std"
]
},
"locked": {
"lastModified": 1680654400,
"narHash": "sha256-Qdpio+ldhUK3zfl22Mhf8HUULdUOJXDWDdO7MIK69OU=",
"owner": "paisano-nix",
"repo": "mdbook-paisano-preprocessor",
"rev": "11a8fc47f574f194a7ae7b8b98001f6143ba4cf1",
"type": "github"
},
"original": {
"owner": "paisano-nix",
"repo": "mdbook-paisano-preprocessor",
"type": "github"
}
},
"paisano-tui": {
"inputs": {
"nixpkgs": [
"watershot",
"std",
"blank"
],
"std": [
"watershot",
"std"
]
},
"locked": {
"lastModified": 1681847764,
"narHash": "sha256-mdd7PJW1BZvxy0cIKsPfAO+ohVl/V7heE5ZTAHzTdv8=",
"owner": "paisano-nix",
"repo": "tui",
"rev": "3096bad91cae73ab8ab3367d31f8a143d248a244",
"type": "github"
},
"original": {
"owner": "paisano-nix",
"ref": "0.1.1",
"repo": "tui",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"anyrun": "anyrun", "anyrun": "anyrun",
"catppuccin-alacritty": "catppuccin-alacritty",
"catppuccin-base16": "catppuccin-base16",
"catppuccin-bat": "catppuccin-bat",
"catppuccin-fish": "catppuccin-fish",
"catppuccin-gitui": "catppuccin-gitui",
"catppuccin-hyprland": "catppuccin-hyprland",
"catppuccin-prismlauncher": "catppuccin-prismlauncher",
"catppuccin-qbittorrent": "catppuccin-qbittorrent",
"catppuccin-starship": "catppuccin-starship",
"catppuccin-zathura": "catppuccin-zathura",
"catppuccin-zsh": "catppuccin-zsh",
"doom-emacs": "doom-emacs", "doom-emacs": "doom-emacs",
"gitui": "gitui", "gitui": "gitui",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"stylix": "stylix", "stylix": "stylix",
"tokyonight-folke": "tokyonight-folke" "tokyonight-folke": "tokyonight-folke",
"watershot": "watershot"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1677221702,
"narHash": "sha256-1M+58rC4eTCWNmmX0hQVZP20t3tfYNunl9D/PrGUyGE=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "f5401f620699b26ed9d47a1d2e838143a18dbe3b",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"watershot",
"std",
"paisano-mdbook-preprocessor",
"crane",
"flake-utils"
],
"nixpkgs": [
"watershot",
"std",
"paisano-mdbook-preprocessor",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1675391458,
"narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"std": {
"inputs": {
"arion": [
"watershot",
"std",
"blank"
],
"blank": "blank",
"devshell": "devshell",
"dmerge": "dmerge",
"flake-utils": "flake-utils",
"incl": "incl",
"makes": [
"watershot",
"std",
"blank"
],
"microvm": [
"watershot",
"std",
"blank"
],
"n2c": "n2c",
"nixago": "nixago",
"nixpkgs": [
"watershot",
"nixpkgs"
],
"paisano": "paisano",
"paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor",
"paisano-tui": "paisano-tui",
"yants": "yants"
},
"locked": {
"lastModified": 1683210511,
"narHash": "sha256-Ag85i6rHubOLB6ChsqGUyZlB2SQCjF7Seo5q12g7jJk=",
"owner": "divnix",
"repo": "std",
"rev": "562310786b998bf52bd02bf7ac6bfcc743e8d45d",
"type": "github"
},
"original": {
"owner": "divnix",
"repo": "std",
"type": "github"
} }
}, },
"stylix": { "stylix": {
@ -417,6 +705,49 @@
"repo": "tokyonight.nvim", "repo": "tokyonight.nvim",
"type": "github" "type": "github"
} }
},
"watershot": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"std": "std"
},
"locked": {
"lastModified": 1695911603,
"narHash": "sha256-l9CPSB8TCw901ugl5FLVZDkp2rLha0yXMewK7LxXIiE=",
"owner": "Kirottu",
"repo": "watershot",
"rev": "64a97b995b153e48063b1cdfda39c9b67f08fe93",
"type": "github"
},
"original": {
"owner": "Kirottu",
"repo": "watershot",
"type": "github"
}
},
"yants": {
"inputs": {
"nixpkgs": [
"watershot",
"std",
"nixpkgs"
]
},
"locked": {
"lastModified": 1667096281,
"narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=",
"owner": "divnix",
"repo": "yants",
"rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c",
"type": "github"
},
"original": {
"owner": "divnix",
"repo": "yants",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -15,6 +15,10 @@
url = "github:Kirottu/anyrun"; url = "github:Kirottu/anyrun";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
watershot = {
url = "github:Kirottu/watershot";
inputs.nixpkgs.follows = "nixpkgs";
};
# Non-flake inputs # Non-flake inputs
doom-emacs = { doom-emacs = {
@ -29,68 +33,10 @@
url = "github:folke/tokyonight.nvim"; url = "github:folke/tokyonight.nvim";
flake = false; flake = false;
}; };
catppuccin-base16 = {
url = "github:catppuccin/base16";
flake = false;
};
catppuccin-alacritty = {
url = "github:catppuccin/alacritty";
flake = false;
};
catppuccin-bat = {
url = "github:catppuccin/bat";
flake = false;
};
catppuccin-fish = {
url = "github:catppuccin/fish";
flake = false;
};
catppuccin-gitui = {
url = "github:catppuccin/gitui";
flake = false;
};
catppuccin-hyprland = {
url = "github:catppuccin/hyprland";
flake = false;
};
catppuccin-prismlauncher = {
url = "github:catppuccin/prismlauncher";
flake = false;
};
catppuccin-qbittorrent = {
url = "github:catppuccin/qbittorrent";
flake = false;
};
catppuccin-starship = {
url = "github:catppuccin/starship";
flake = false;
};
catppuccin-zathura = {
url = "github:catppuccin/zathura";
flake = false;
};
catppuccin-zsh = {
url = "github:catppuccin/zsh-syntax-highlighting";
flake = false;
};
}; };
outputs = { self, nixpkgs, home-manager, stylix, ... }@inputs: outputs = { self, nixpkgs, home-manager, stylix, ... }@inputs:
let let
catppuccin-themes = with inputs; {
alacritty = "${catppuccin-alacritty}/catppuccin-macchiato.yml";
bat = "${catppuccin-bat}/Catppuccin-macchiato.tmTheme";
fish = "${catppuccin-fish}/themes/Catppuccin Macchiato.theme";
gitui = "${catppuccin-gitui}/theme/macchiato.ron";
hyprland = "${catppuccin-hyprland}/themes/macchiato.conf";
prismlauncher =
"${catppuccin-prismlauncher}/themes/Macchiato/Catppuccin-Macchiato.zip";
qbittorrent = "${catppuccin-qbittorrent}/macchiato.qbtheme";
starship = "${catppuccin-starship}/palettes/macchiato.toml";
zathura = "${catppuccin-zathura}/src/catppuccin-macchiato";
zsh =
"${catppuccin-zsh}/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh";
};
default = { default = {
hostName = "Atlas"; hostName = "Atlas";
user = "xenia"; user = "xenia";
@ -124,10 +70,9 @@
let let
specialArgs = { specialArgs = {
inherit hostName user; inherit hostName user;
inherit (inputs) anyrun catppuccin-base16; inherit (inputs) anyrun watershot;
}; };
extraSpecialArgs = specialArgs // { extraSpecialArgs = specialArgs // {
inherit catppuccin-themes;
inherit (inputs) doom-emacs gitui tokyonight-folke; inherit (inputs) doom-emacs gitui tokyonight-folke;
}; };
in nixpkgs.lib.nixosSystem { in nixpkgs.lib.nixosSystem {

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, catppuccin-themes, gitui, ... }: { config, lib, pkgs, tokyonight-folke, gitui, ... }:
{ {
programs = { programs = {
@ -33,7 +33,6 @@
line-numbers = true; line-numbers = true;
navigate = true; navigate = true;
side-by-side = true; side-by-side = true;
syntax-theme = "Catppuccin";
zero-style = "dim syntax"; zero-style = "dim syntax";
}; };
}; };
@ -46,13 +45,10 @@
gitui = { gitui = {
enable = true; enable = true;
keyConfig = builtins.readFile "${gitui}/vim_style_key_config.ron"; keyConfig = builtins.readFile "${gitui}/vim_style_key_config.ron";
theme = builtins.readFile catppuccin-themes.gitui; theme = builtins.readFile
}; "${tokyonight-folke}/extras/gitui/tokyonight_night.ron";
bat = {
enable = true;
config.theme = "Catppuccin";
themes.Catppuccin = builtins.readFile catppuccin-themes.bat;
}; };
bat.enable = true;
ssh = { ssh = {
enable = true; enable = true;
forwardAgent = true; forwardAgent = true;
@ -100,24 +96,20 @@
enableBashIntegration = true; enableBashIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
settings = { settings = {
inherit (builtins.fromTOML
(builtins.readFile catppuccin-themes.starship))
palettes;
command_timeout = 1000; command_timeout = 1000;
add_newline = true; add_newline = true;
palette = "catppuccin_macchiato";
character = { character = {
success_symbol = "[[󱢠](green) ](maroon)"; success_symbol = "[󱢠 ](green)";
error_symbol = "[](red)"; error_symbol = "[](red)";
}; };
directory = { directory = {
truncation_length = 2; truncation_length = 2;
fish_style_pwd_dir_length = 1; fish_style_pwd_dir_length = 1;
read_only = " 󰉐"; read_only = " 󰉐";
style = "bold lavender"; # style = "bold lavender";
truncate_to_repo = false; truncate_to_repo = false;
before_repo_root_style = "bold lavender"; # before_repo_root_style = "bold lavender";
repo_root_style = "bold teal"; # repo_root_style = "bold teal";
}; };
line_break.disabled = false; line_break.disabled = false;
git_branch = { git_branch = {
@ -134,7 +126,7 @@
hostname = { hostname = {
ssh_only = true; ssh_only = true;
ssh_symbol = "󰢹 "; ssh_symbol = "󰢹 ";
style = "bold green"; # style = "bold green";
}; };
localip.disabled = false; localip.disabled = false;
memory_usage = { memory_usage = {
@ -145,7 +137,7 @@
os = { os = {
disabled = false; disabled = false;
format = "on [$symbol $name ]($style)"; format = "on [$symbol $name ]($style)";
style = "bold blue"; # style = "bold blue";
symbols = { symbols = {
Alpine = " "; Alpine = " ";
Android = " "; Android = " ";
@ -199,7 +191,7 @@
sensibleOnTop = true; sensibleOnTop = true;
shortcut = "Space"; shortcut = "Space";
terminal = "xterm-256color"; terminal = "xterm-256color";
plugins = with pkgs.tmuxPlugins; [ yank tmux-fzf catppuccin ]; plugins = with pkgs.tmuxPlugins; [ yank tmux-fzf ];
extraConfig = '' extraConfig = ''
# https://old.reddit.com/r/tmux/comments/mesrci/tmux_2_doesnt_seem_to_use_256_colors/ # https://old.reddit.com/r/tmux/comments/mesrci/tmux_2_doesnt_seem_to_use_256_colors/
set -ga terminal-overrides ",*256col*,alacritty:Tc" set -ga terminal-overrides ",*256col*,alacritty:Tc"
@ -222,9 +214,6 @@
dotDir = ".config/zsh"; dotDir = ".config/zsh";
historySubstringSearch.enable = true; historySubstringSearch.enable = true;
history.path = "${config.xdg.dataHome}/zsh/history"; history.path = "${config.xdg.dataHome}/zsh/history";
initExtraFirst = ''
source ${catppuccin-themes.zsh}
'';
initExtra = '' initExtra = ''
xdg-query-program () { xdg-query-program () {
FILETYPE=$(xdg-mime query filetype $@) FILETYPE=$(xdg-mime query filetype $@)

View file

@ -1,7 +1,6 @@
{ config, pkgs, theme, ... }: { config, pkgs, ... }:
let cursorSize = 24; let cursorSize = 24;
in '' in ''
source = ${theme}
source = ./extra.conf source = ./extra.conf
monitor=,preferred,auto,auto monitor=,preferred,auto,auto
@ -44,10 +43,6 @@ in ''
gaps_in = 5 gaps_in = 5
gaps_out = 10 gaps_out = 10
border_size = 1 border_size = 1
col.active_border = $lavender
col.group_border_active = $lavender
col.inactive_border = $surface2
col.group_border = $surface2
cursor_inactive_timeout = 5 cursor_inactive_timeout = 5
layout = master layout = master
} }
@ -211,47 +206,47 @@ in ''
bind = SUPER, D, moveworkspacetomonitor, 2 current bind = SUPER, D, moveworkspacetomonitor, 2 current
bind = SUPER, D, workspace, 2 bind = SUPER, D, workspace, 2
bind = SUPER SHIFT, D, movetoworkspace, 2 bind = SUPER SHIFT, D, movetoworkspace, 2
windowrule = workspace 2,(emacs) windowrule = workspace 2 silent,(emacs)
# 3: [b]rowser # 3: [b]rowser
bind = SUPER, W, moveworkspacetomonitor, 3 current bind = SUPER, W, moveworkspacetomonitor, 3 current
bind = SUPER, W, workspace, 3 bind = SUPER, W, workspace, 3
bind = SUPER SHIFT, W, movetoworkspace, 3 bind = SUPER SHIFT, W, movetoworkspace, 3
windowrule = workspace 3,(firefox) windowrule = workspace 3 silent,(firefox)
# 4: [a]genda (or c[a]lendar) # 4: [a]genda (or c[a]lendar)
bind = SUPER, A, moveworkspacetomonitor, 4 current bind = SUPER, A, moveworkspacetomonitor, 4 current
bind = SUPER, A, workspace, 4 bind = SUPER, A, workspace, 4
bind = SUPER SHIFT, A, movetoworkspace, 4 bind = SUPER SHIFT, A, movetoworkspace, 4
windowrulev2 = workspace 5,class:(Alacritty),title:(khal interactive) windowrulev2 = workspace 5 silent,class:(Alacritty),title:(khal interactive)
# 5: [f]iles # 5: [f]iles
bind = SUPER, F, moveworkspacetomonitor, 5 current bind = SUPER, F, moveworkspacetomonitor, 5 current
bind = SUPER, F, workspace, 5 bind = SUPER, F, workspace, 5
bind = SUPER SHIFT, F, movetoworkspace, 5 bind = SUPER SHIFT, F, movetoworkspace, 5
windowrule = workspace 5,^(libreoffice).* windowrule = workspace 5 silent,^(libreoffice).*
windowrulev2 = workspace 5,title:(Open),class:(soffice) windowrulev2 = workspace 5 silent,title:(Open),class:(soffice)
# 6: [s]potify (or mu[s]ic) # 6: [s]potify (or mu[s]ic)
bind = SUPER, S, moveworkspacetomonitor, 6 current bind = SUPER, S, moveworkspacetomonitor, 6 current
bind = SUPER, S, workspace, 6 bind = SUPER, S, workspace, 6
bind = SUPER SHIFT, S, movetoworkspace, 6 bind = SUPER SHIFT, S, movetoworkspace, 6
windowrulev2 = workspace 6,class:(Alacritty),title:(ncspot) windowrulev2 = workspace 6 silent,class:(Alacritty),title:(ncspot)
# 7: [c]hat # 7: [c]hat
bind = SUPER, C, moveworkspacetomonitor, 7 current bind = SUPER, C, moveworkspacetomonitor, 7 current
bind = SUPER, C, workspace, 7 bind = SUPER, C, workspace, 7
bind = SUPER SHIFT, C, movetoworkspace, 7 bind = SUPER SHIFT, C, movetoworkspace, 7
windowrule = workspace 7,(Signal) windowrule = workspace 7 silent,(Signal)
windowrule = workspace 7,(fractal) windowrule = workspace 7 silent,(fractal)
windowrule = workspace 7,(Ferdium) windowrule = workspace 7 silent,(Ferdium)
# 8: [r]emote # 8: [r]emote
bind = SUPER, R, moveworkspacetomonitor, 8 current bind = SUPER, R, moveworkspacetomonitor, 8 current
bind = SUPER, R, workspace, 8 bind = SUPER, R, workspace, 8
bind = SUPER SHIFT, R, movetoworkspace, 8 bind = SUPER SHIFT, R, movetoworkspace, 8
windowrule = workspace 8,(org.remmina.Remmina) windowrule = workspace 8 silent,(org.remmina.Remmina)
windowrule = workspace 8,(Nxplayer.bin) windowrule = workspace 8 silent,(Nxplayer.bin)
windowrule = nofullscreenrequest,(Nxplayer.bin) windowrule = nofullscreenrequest,(Nxplayer.bin)
windowrule = nomaximizerequest,(Nxplayer.bin) windowrule = nomaximizerequest,(Nxplayer.bin)
@ -259,7 +254,7 @@ in ''
bind = SUPER, G, moveworkspacetomonitor, 9 current bind = SUPER, G, moveworkspacetomonitor, 9 current
bind = SUPER, G, workspace, 9 bind = SUPER, G, workspace, 9
bind = SUPER SHIFT, G, movetoworkspace, 9 bind = SUPER SHIFT, G, movetoworkspace, 9
windowrule = workspace 9,(steam) windowrule = workspace 9 silent,(steam)
# Special workspaces # Special workspaces
bind = SUPER, comma, workspace, m-1 bind = SUPER, comma, workspace, m-1

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, catppuccin-themes, ... }: { config, lib, pkgs, anyrun, ... }:
{ {
imports = [ imports = [
@ -10,15 +10,13 @@
./anyrun.nix ./anyrun.nix
./gtk.nix ./gtk.nix
]; ];
home.packages = [ anyrun.packages.${pkgs.system}.default ];
services.swayosd.enable = true; services.swayosd.enable = true;
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
systemdIntegration = true; systemdIntegration = true;
extraConfig = import ./config.nix { extraConfig = import ./config.nix { inherit config pkgs; };
inherit config pkgs;
theme = catppuccin-themes.hyprland;
};
}; };
xdg = { xdg = {
configFile = { configFile = {

View file

@ -1,13 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
let
catppuccin-gtk = pkgs.catppuccin-gtk.override { {
accents = [ "lavender" ];
size = "compact";
tweaks = [ "rimless" ];
variant = "macchiato";
};
in {
stylix.targets.gtk.enable = false;
home.packages = with pkgs; [ home.packages = with pkgs; [
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
libsForQt5.breeze-gtk libsForQt5.breeze-gtk
@ -23,10 +16,6 @@ in {
package = pkgs.papirus-icon-theme; package = pkgs.papirus-icon-theme;
name = "Papirus-Dark"; name = "Papirus-Dark";
}; };
theme = {
package = catppuccin-gtk;
name = "Catppuccin-Macchiato-Compact-Lavender-dark";
};
}; };
xdg.configFile."gtklock/config.ini".text = let xdg.configFile."gtklock/config.ini".text = let
powerbar = "${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so"; powerbar = "${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so";

View file

@ -1,9 +1,9 @@
{ pkgs, ... }: { { pkgs, ... }: {
home.packages = with pkgs; [ networkmanagerapplet bluez ]; home.packages = with pkgs; [ networkmanagerapplet bluez ];
stylix.targets.waybar.enable = false; # stylix.targets.waybar.enable = false;
programs.waybar = { programs.waybar = {
enable = true; enable = true;
style = ./style.css; # style = ./style.css;
systemd = { systemd = {
enable = true; enable = true;
target = "hyprland-session.target"; target = "hyprland-session.target";
@ -13,15 +13,7 @@
position = "top"; position = "top";
"modules-left" = [ "hyprland/workspaces" ]; "modules-left" = [ "hyprland/workspaces" ];
"modules-center" = [ "mpris" ]; "modules-center" = [ "mpris" ];
"modules-right" = [ "modules-right" = [ "pulseaudio" "backlight" "battery" "tray" "clock" ];
"pulseaudio"
"bluetooth"
"network"
"backlight"
"battery"
"tray"
"clock"
];
"hyprland/workspaces" = import ./modules/hyprland_workspaces.nix; "hyprland/workspaces" = import ./modules/hyprland_workspaces.nix;
mpris = import ./modules/mpris.nix; mpris = import ./modules/mpris.nix;
cpu = import ./modules/cpu.nix; cpu = import ./modules/cpu.nix;
@ -29,8 +21,6 @@
temperature = import ./modules/temperature.nix; temperature = import ./modules/temperature.nix;
clock = import ./modules/clock.nix; clock = import ./modules/clock.nix;
pulseaudio = import ./modules/pulseaudio.nix; pulseaudio = import ./modules/pulseaudio.nix;
bluetooth = import ./modules/bluetooth.compact.nix;
network = import ./modules/network.compact.nix;
backlight = import ./modules/backlight.nix; backlight = import ./modules/backlight.nix;
battery = import ./modules/battery.compact.nix; battery = import ./modules/battery.compact.nix;
tray = import ./modules/tray.nix; tray = import ./modules/tray.nix;

View file

@ -1,67 +1,18 @@
@define-color base #24273a;
@define-color mantle #1e2030;
@define-color crust #181926;
@define-color text #cad3f5;
@define-color subtext0 #a5adcb;
@define-color subtext1 #b8c0e0;
@define-color surface0 #363a4f;
@define-color surface1 #494d64;
@define-color surface2 #5b6078;
@define-color overlay0 #6e738d;
@define-color overlay1 #8087a2;
@define-color overlay2 #939ab7;
@define-color blue #8aadf4;
@define-color lavender #b7bdf8;
@define-color sapphire #7dc4e4;
@define-color sky #91d7e3;
@define-color teal #8bd5ca;
@define-color green #a6da95;
@define-color yellow #eed49f;
@define-color peach #f5a97f;
@define-color maroon #ee99a0;
@define-color red #ed8796;
@define-color mauve #c6a0f6;
@define-color pink #f5bde6;
@define-color flamingo #f0c6c6;
@define-color rosewater #f4dbd6;
* { * {
/* border: none; */
/* border-radius: 0px; */
/* margin: 0px; */
/* background: transparent; */
/* color: @text; */
font-family: "Fira Sans"; font-family: "Fira Sans";
font-size: 18px; font-size: 18px;
} }
window { background: transparent; }
window > box { window > box {
color: @text;
background: rgba(36, 39, 58, 0.5);
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
border-left: 1px solid @surface2;
border-right: 1px solid @surface2;
border-bottom: 1px solid @surface2;
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-top-right-radius: 0px; border-top-right-radius: 0px;
border-bottom-left-radius: 10px; border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px; border-bottom-right-radius: 10px;
} }
tooltip { tooltip { border-radius: 10px; }
color: @text;
background: rgba(36, 39, 58, 0.5);
box-shadow: inset 0 0 0 1px rgba(183, 189, 248, 0.1), 0 0 0 1px rgba(36, 39, 58, 0.5);
border: 1px solid @lavender;
border-radius: 10px;
}
#workspaces, #workspaces,
#cava, #cava,
@ -76,14 +27,7 @@ tooltip {
#backlight, #backlight,
#battery, #battery,
#tray { #tray {
color: @text;
margin: 0px; margin: 0px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
} }
#workspaces button { color: @surface2; }
#workspaces button.active { color: @lavender; }
#workspaces button.urgent { color: @red; }

View file

@ -1,8 +1,9 @@
{ catppuccin-themes, ... }: { tokyonight-folke, ... }:
{ {
programs.zathura = { programs.zathura = {
enable = true; enable = true;
extraConfig = builtins.readFile catppuccin-themes.zathura; extraConfig = builtins.readFile
"${tokyonight-folke}/extras/zathura/tokyonight_night.zathurarc";
}; };
} }

View file

@ -25,6 +25,7 @@ in {
"steam-run" "steam-run"
"nomachine-client" "nomachine-client"
]; ];
boot.plymouth.enable = true;
networking = { networking = {
networkmanager.enable = true; networkmanager.enable = true;
nameservers = [ "9.9.9.9" ]; nameservers = [ "9.9.9.9" ];

View file

@ -12,7 +12,6 @@
qtgraphicaleffects qtgraphicaleffects
qtsvg qtsvg
qtquickcontrols2 qtquickcontrols2
catppuccin-sddm-corners
protonvpn-cli protonvpn-cli
protonvpn-gui protonvpn-gui
qbittorrent qbittorrent
@ -91,12 +90,7 @@
enable = true; enable = true;
layout = "gb"; layout = "gb";
xkbVariant = ""; xkbVariant = "";
displayManager.sddm = { displayManager.lightdm.enable = true;
enable = true;
theme = "catppuccin-sddm-corners";
autoNumlock = true;
settings = { General = { InputMethod = ""; }; };
};
}; };
}; };
programs = { programs = {

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, user, ... }: { config, lib, pkgs, user, watershot, ... }:
{ {
imports = [ ./desktop.nix ]; imports = [ ./desktop.nix ];
@ -18,6 +18,7 @@
wireplumber wireplumber
wtype wtype
wl-clipboard wl-clipboard
watershot.packages.${pkgs.system}.default
grim grim
slurp slurp
swayimg swayimg