diff --git a/flake.lock b/flake.lock index ce4a095..79b5b71 100644 --- a/flake.lock +++ b/flake.lock @@ -1,119 +1,5 @@ { "nodes": { - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-fish": { - "flake": false, - "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", - "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", - "type": "github" - }, - "original": { - "owner": "chriskempson", - "repo": "base16-vim", - "type": "github" - } - }, "devshell": { "inputs": { "flake-utils": "flake-utils", @@ -166,22 +52,6 @@ "type": "github" } }, - "flake-compat_3": { - "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": [ @@ -203,6 +73,21 @@ "type": "github" } }, + "flake-root": { + "locked": { + "lastModified": 1713493429, + "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "owner": "srid", + "repo": "flake-root", + "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -221,54 +106,11 @@ "type": "github" } }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ "nixvim", - "git-hooks", + "pre-commit-hooks", "nixpkgs" ] }, @@ -286,23 +128,6 @@ "type": "github" } }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "46.1", - "repo": "gnome-shell", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -310,11 +135,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -332,32 +157,11 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -374,11 +178,11 @@ ] }, "locked": { - "lastModified": 1716993688, - "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "lastModified": 1715901937, + "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", + "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8", "type": "github" }, "original": { @@ -389,11 +193,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -404,11 +208,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717265169, - "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "type": "github" }, "original": { @@ -423,20 +227,21 @@ "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", + "flake-root": "flake-root", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], + "pre-commit-hooks": "pre-commit-hooks", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1717574948, - "narHash": "sha256-8C2S1WWC4ty1LePzFWp+D6re/pggCJj9tWslddJ/wUw=", + "lastModified": 1716294469, + "narHash": "sha256-1RdJkVa+axdzLhbeoWJoC3BPODxfx+/Rv7HE+e4CK/Y=", "owner": "nix-community", "repo": "nixvim", - "rev": "a54ee8ad64c91b587c3460126bad25a441c1118c", + "rev": "1c9f2a23a6cb9406c35980f4af1a4356f56771e9", "type": "github" }, "original": { @@ -445,13 +250,39 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715870890, + "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixvim": "nixvim", - "sops-nix": "sops-nix", - "stylix": "stylix" + "sops-nix": "sops-nix" } }, "sops-nix": { @@ -462,11 +293,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717455931, - "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", + "lastModified": 1716244104, + "narHash": "sha256-XXbqfkyWe0d0O+zqRQWi2oXi6wYDmTzXedFkBRwx1VI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", + "rev": "fddd52460e3332eedd8a0043af5675338a5b3e0b", "type": "github" }, "original": { @@ -475,36 +306,6 @@ "type": "github" } }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-foot": "base16-foot", - "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", - "base16-vim": "base16-vim", - "flake-compat": "flake-compat_3", - "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717593209, - "narHash": "sha256-Hc8yIj1CDuVOpUV13ZWvR+5CPXysBmuUqqB8bJ7/CgQ=", - "owner": "danth", - "repo": "stylix", - "rev": "1d3826ceed91ae67562f28ee2e135813a11e47a6", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "stylix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 6717458..bdff37d 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,6 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - stylix = { - url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -63,7 +59,6 @@ modules = [ inputs.nixvim.homeManagerModules.nixvim inputs.sops-nix.homeManagerModules.sops - inputs.stylix.homeManagerModules.stylix ./home.nix ]; }; diff --git a/home.nix b/home.nix index 975d57e..819b695 100644 --- a/home.nix +++ b/home.nix @@ -1,12 +1,11 @@ { config, pkgs, lib, ... }: { - home = { - username = "muhh"; - homeDirectory = "/home/muhh"; - activation.setupEtc = config.lib.dag.entryAfter [ "writeBoundary" ] '' + home.username = "muhh"; + home.homeDirectory = "/home/muhh"; + home.activation.setupEtc = config.lib.dag.entryAfter [ "writeBoundary" ] '' /run/current-system/sw/bin/systemctl start --user sops-nix ''; - packages = with pkgs; [ + home.packages = with pkgs; [ # # It is sometimes useful to fine-tune packages, for example, by applying # # overrides. You can do that directly here, just don't forget the # # parentheses. Maybe you want to install Nerd Fonts with a limited number of @@ -19,46 +18,35 @@ # (pkgs.writeShellScriptBin "my-hello" '' # echo "Hello, ${config.home.username}!" # '') - _1password - _1password-gui - atkinson-hyperlegible - brightnessctl - curl - distrobox - fd - ffmpegthumbnailer - git - htop - httpie - neovide - (nerdfonts.override { fonts = [ "Iosevka" ]; }) - maid - mediainfo - mpv - morgen - obsidian - pavucontrol - powertop - qutebrowser - rclone - solargraph - sops - sxiv - steam-run - tmux - unzip - via - wget - wl-clipboard - xdg-utils - zellij - zulip - zulip-term - ]; + _1password + _1password-gui + atkinson-hyperlegible + brightnessctl + curl + distrobox + fd + git + httpie + neovide + (nerdfonts.override { fonts = [ "Iosevka" ]; }) + mpv + morgen + obsidian + powertop + qutebrowser + solargraph + sops + tmux + wget + wl-clipboard + zellij + zulip + zulip-term + ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage # plain files is through 'home.file'. - file = { + home.file = { # # Building this configuration will create a copy of 'dotfiles/screenrc' in # # the Nix store. Activating the configuration will then make '~/.screenrc' a # # symlink to the Nix store copy. @@ -69,7 +57,7 @@ # org.gradle.console=verbose # org.gradle.daemon.idletimeout=3600000 # ''; - }; + }; # You can also manage environment variables but you will have to manually # source @@ -81,9 +69,8 @@ # /etc/profiles/per-user/muhh/etc/profile.d/hm-session-vars.sh # # if you don't want to manage your shell through Home Manager. - sessionVariables = { - EDITOR = "nvim"; - }; + home.sessionVariables = { + EDITOR = "nvim"; }; accounts = { @@ -119,6 +106,18 @@ }; bat = { enable = true; + config.theme = "Catppuccin-mocha"; + themes = { + Catppuccin-mocha = { + src = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "bat"; + rev = "main"; + sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; + }; + file = "Catppuccin-mocha.tmTheme"; + }; + }; }; btop = { enable = true; @@ -184,15 +183,14 @@ enableFishIntegration = true; keys = [ "id_ed25519" - "id_rsa" ]; }; kitty = { enable = true; shellIntegration.enableFishIntegration = true; font = { - name = lib.mkForce "Iosevka Nerd Font"; - size = lib.mkForce 14; + name = "Iosevka Nerd Font"; + size = 14; }; keybindings = { "ctrl+shift+g" = "show_last_command_output"; @@ -212,7 +210,7 @@ "ctrl+shift+z" = "next_layout"; }; settings = { - background_opacity = lib.mkForce "0.95"; + background_opacity = "0.95"; dynamic_background_opacity = true; enabled_layouts = "tall:bias=50;full_size=1"; scrollback_lines = 10000; @@ -224,7 +222,7 @@ tab_powerline_style = "round"; tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}"; }; - # theme = "Catppuccin-Mocha"; + theme = "Catppuccin-Mocha"; }; lazygit = { enable = true; @@ -243,15 +241,15 @@ vimAlias = true; viAlias = true; clipboard.providers.wl-copy.enable = true; - # colorschemes = { - # catppuccin = { - # enable = true; - # settings = { - # flavour = "mocha"; - # show_end_of_buffer = true; - # }; - # }; - # }; + colorschemes = { + catppuccin = { + enable = true; + settings = { + flavour = "mocha"; + show_end_of_buffer = true; + }; + }; + }; globals.mapleader = " "; globals.maplocalleader = " "; keymaps = [ @@ -352,27 +350,7 @@ }; nnn = { enable = true; - extraPackages = with pkgs; [ - ffmpegthumbnailer - mediainfo - sxiv - ]; - package = pkgs.nnn.override ({ - withNerdIcons = true; - }); - plugins = { - mappings = { - c = "fzcd"; - f = "finder"; - v = "imgview"; - }; - src = (pkgs.fetchFromGitHub { - owner = "jarun"; - repo = "nnn"; - rev = "v4.9"; - sha256 = "sha256-Hpc8YaJeAzJoEi7aJ6DntH2VLkoR6ToP6tPYn3llR7k="; - }) + "/plugins"; - }; + extraPackages = with pkgs; [ ffmpegthumbnailer mediainfo sxiv ]; }; mbsync = { enable = true; @@ -383,38 +361,6 @@ enableFishIntegration = true; }; swaylock.enable = true; - waybar = { - enable = true; - systemd.enable = true; - settings = { - mainBar = { - layer = "top"; - position = "top"; - height = 36; - spacing = 3; - output = [ "DP-1" ]; - modules-left = [ - "sway/workspaces" - "sway/mode" - "sway/scratchpad" - "sway/window" - "custom/media" - ]; - modules-center = [ - "clock" - "idle_inhibitor" - ]; - modules-right = [ - "pulseaudio" - "backlight" - "network" - "tray" - "custom/notification" - "custom/power" - ]; - }; - }; - }; zoxide = { enable = true; }; @@ -465,9 +411,6 @@ } ]; }; - swayosd = { - enable = true; - }; syncthing = { enable = true; # dataDir = "/home/muhh/Sync"; @@ -489,31 +432,21 @@ }; }; - stylix = { - image = /home/muhh/Sync/Backgrounds/wald.jpg; - polarity = "dark"; - # base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-moon.yaml"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; - }; - wayland.windowManager = { sway = { enable = true; - extraConfig = '' - smart_gaps inverse_outer - ''; config = { gaps = { inner = 50; vertical = 100; horizontal = 600; - # smartGaps = true; + smartGaps = true; smartBorders = "on"; }; input = { "type:keyboard" = { - xkb_layout = "eu"; - xkb_options = "compose:rwin"; + xkb_variant = "eu"; + xkb_options = "compose:ralt"; }; "type:touchpad" = { tap = "enabled"; @@ -539,15 +472,14 @@ output = { DP-1 = { resolution = "3840x2160@30Hz"; - position = "1280 0"; + position = "1920 0"; # background = "/home/muhh/Sync/Backgrounds/wald.jpg fill"; - scale = "1.25"; + scale = "1.0"; }; HDMI-A-1 = { resolution = "1920x1080@60.000Hz"; transform = "180"; position = "0 0"; - scale = "1.5"; # background = "/home/muhh/Sync/Backgrounds/pfuetze.jpg fill"; }; }; @@ -560,29 +492,9 @@ window = { titlebar = false; }; - # workspaceOutputAssign = [ - # { - # workspace = "2"; - # output = "DP-1"; - # } - # ]; - workspaceOutputAssign = - map (x: { - workspace = x; - output = "DP-1"; - }) ["1" "2" "3" "4" "5" "6" "7"] - ++ map (x: { - workspace = x; - output = "HDMI-A-1"; - }) ["8" "9" "10"]; }; - wrapperFeatures.gtk = true; }; }; - xdg = { - enable = true; - mimeApps.enable = true; - }; # leave things below alone. home.stateVersion = "23.05"; diff --git a/hosts/cube.nix b/hosts/cube.nix index bdc862e..89a72d7 100644 --- a/hosts/cube.nix +++ b/hosts/cube.nix @@ -52,9 +52,8 @@ }; security = { - pam.services.swaylock = {}; - polkit.enable = true; rtkit.enable = true; + pam.services.swaylock = {}; }; services.envfs.enable = true; services.flatpak.enable = true; @@ -128,10 +127,7 @@ enable = true; enableSSHSupport = true; }; - light = { - enable = true; - brightnessKeys.enable = true; - }; + light.enable = true; sway.enable = true; }; virtualisation = { @@ -144,15 +140,7 @@ }; }; - xdg = { - portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - ]; - }; - }; + xdg.portal.wlr.enable = true; # Enable the OpenSSH daemon. # services.openssh.enable = true;