diff --git a/flake.lock b/flake.lock index 0b098d9..3e46fe4 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -26,15 +26,15 @@ "base16-schemes": { "flake": false, "locked": { - "lastModified": 1654895891, - "narHash": "sha256-xYYmZkHnyLCUBAkqkZ7v1Lc5m39857MukQLMRtGuvdk=", - "owner": "base16-project", + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", + "owner": "tinted-theming", "repo": "base16-schemes", - "rev": "7c247f734eac7f04518c6e28d098635ee8dcabf5", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", "type": "github" }, "original": { - "owner": "base16-project", + "owner": "tinted-theming", "repo": "base16-schemes", "type": "github" } @@ -42,14 +42,15 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1669120813, - "narHash": "sha256-00O/dvvcELCdpuFPde+bsJ9Bw974b/VunUArWlJ+lQA=", + "lastModified": 1708275876, + "narHash": "sha256-GzC+0fJhU/0TnFyVMe309ffmRIyRiMzqQ6zDcmn5s9s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a9c2a436757f09abc4c7bc0abc4d2529b312e42b", + "rev": "6c7eca7e41d5d47a0777b045a125a6f076b70c34", "type": "github" }, "original": { @@ -59,12 +60,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -101,11 +105,11 @@ ] }, "locked": { - "lastModified": 1703367386, - "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { @@ -121,11 +125,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1667165773, - "narHash": "sha256-47gEPN7UKrNM+a3OKAFtNQeyc1/sSPgDm3OGCgphCyo=", + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", "owner": "misterio77", "repo": "nix-colors", - "rev": "a58fb210eb285920ec10f204d007185b3629cadc", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", "type": "github" }, "original": { @@ -136,25 +140,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669076005, - "narHash": "sha256-uzMji2q9Pk3jUH+e5nEFtoOZCP4VV1PDRJRLVmriY0M=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "69335c46c48a73f291d5c6f332fb9fe8b8e22b30", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1655599917, - "narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=", + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", "type": "github" }, "original": { @@ -163,13 +169,29 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1708161998, + "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "84d981bae8b5e783b3b548de505b22880559515f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1703467016, - "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", + "lastModified": 1708161998, + "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", + "rev": "84d981bae8b5e783b3b548de505b22880559515f", "type": "github" }, "original": { @@ -181,11 +203,11 @@ }, "nur": { "locked": { - "lastModified": 1669288341, - "narHash": "sha256-lGwsFdSDb+IBXSJwKhNLOP2yt7PDXxbL0uxN9ZVOy8I=", + "lastModified": 1708293570, + "narHash": "sha256-S8qH9mIUma122q9Wboh+5u+dJmZC2lnnG4MkOGteFwo=", "owner": "nix-community", "repo": "NUR", - "rev": "107aad385e04edf5b4bd4136bf8defcd890ecfc7", + "rev": "7ccf5f725834f28e908780ffdacc744319f2834b", "type": "github" }, "original": { @@ -218,6 +240,21 @@ "repo": "default", "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" + } } }, "root": "root", diff --git a/hosts/kopavogur/README.org b/hosts/kopavogur/kopavogur.org similarity index 100% rename from hosts/kopavogur/README.org rename to hosts/kopavogur/kopavogur.org diff --git a/hosts/reykjavik/README.org b/hosts/reykjavik/reykjavik.org similarity index 100% rename from hosts/reykjavik/README.org rename to hosts/reykjavik/reykjavik.org diff --git a/hosts/thingvellir/README.org b/hosts/thingvellir/thingvellir.org similarity index 100% rename from hosts/thingvellir/README.org rename to hosts/thingvellir/thingvellir.org diff --git a/hosts/vultr-test/README.org b/hosts/vultr-test/README.org deleted file mode 100644 index 84278be..0000000 --- a/hosts/vultr-test/README.org +++ /dev/null @@ -1,2 +0,0 @@ -* Hvanndal -Servidor a Vultr diff --git a/hosts/vultr-test/default.nix b/hosts/vultr-test/default.nix deleted file mode 100644 index bd4d4b8..0000000 --- a/hosts/vultr-test/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config, pkgs, lib, inputs, ... }: - -with lib; -{ - imports = [ - ./hardware.nix - ]; - - # - Basic -------------------------------------- - - user.name = "marc"; - user.shell = pkgs.zsh; - networking.hostName = "hvannadal"; - networking.firewall = { - enable = true; - }; - - # - Bootloader --------------------------------- - - boot.loader.grub = { - enable = true; - device = "/dev/vda"; - }; - - # - Modules ------------------------------------ - - samfelag.modules = { - # - Common ----------------------------------- - # See modules/common.nix for common packages installed - - # - System ----------------------------------- - system.utils.enable = true; - system.gpg.enable = true; - system.pass.enable = true; - system.ssh.enable = true; - system.sshfs.enable = true; - - # - Editors and development ------------------ - dev.git.userName = "marc"; - dev.git.userEmail = "marc@sastre.cat"; - - dev.docker.enable = true; - dev.docker.users = ["marc"]; - }; -} diff --git a/hosts/vultr-test/hardware.nix b/hosts/vultr-test/hardware.nix deleted file mode 100644 index 8d24782..0000000 --- a/hosts/vultr-test/hardware.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ ]; - - boot = { - initrd = { - availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; - kernelModules = [ ]; - }; - kernelModules = [ ]; - extraModulePackages = [ ]; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-label/nixos"; - fsType = "ext4"; - }; - }; - - swapDevices = [ - { device = "/dev/disk/by-label/swap"; } - ]; - - networking = { - useDHCP = lib.mkDefault true; - interfaces = { - ens3.useDHCP = lib.mkDefault true; - }; - nameservers = [ "108.61.10.10" ]; - }; - - virtualisation.hypervGuest.enable = true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/modules/app/alacritty.nix b/modules/app/alacritty.nix index ed0ff7d..d1fa511 100644 --- a/modules/app/alacritty.nix +++ b/modules/app/alacritty.nix @@ -26,29 +26,29 @@ in hm.xdg.configFile."alacritty/theme.yml".text = '' colors: primary: - background: '0x${config.colorScheme.colors.base00}' - foreground: '0x${config.colorScheme.colors.base05}' + background: '0x${config.colorScheme.palette.base00}' + foreground: '0x${config.colorScheme.palette.base05}' cursor: - text: '0x${config.colorScheme.colors.base00}' - cursor: '0x${config.colorScheme.colors.base05}' + text: '0x${config.colorScheme.palette.base00}' + cursor: '0x${config.colorScheme.palette.base05}' normal: - black: '0x${config.colorScheme.colors.base00}' - red: '0x${config.colorScheme.colors.base08}' - green: '0x${config.colorScheme.colors.base0B}' - yellow: '0x${config.colorScheme.colors.base0A}' - blue: '0x${config.colorScheme.colors.base0D}' - magenta: '0x${config.colorScheme.colors.base0E}' - cyan: '0x${config.colorScheme.colors.base0C}' - white: '0x${config.colorScheme.colors.base05}' + black: '0x${config.colorScheme.palette.base00}' + red: '0x${config.colorScheme.palette.base08}' + green: '0x${config.colorScheme.palette.base0B}' + yellow: '0x${config.colorScheme.palette.base0A}' + blue: '0x${config.colorScheme.palette.base0D}' + magenta: '0x${config.colorScheme.palette.base0E}' + cyan: '0x${config.colorScheme.palette.base0C}' + white: '0x${config.colorScheme.palette.base05}' bright: - black: '0x${config.colorScheme.colors.base03}' - red: '0x${config.colorScheme.colors.base09}' - green: '0x${config.colorScheme.colors.base01}' - yellow: '0x${config.colorScheme.colors.base02}' - blue: '0x${config.colorScheme.colors.base04}' - magenta: '0x${config.colorScheme.colors.base06}' - cyan: '0x${config.colorScheme.colors.base0F}' - white: '0x${config.colorScheme.colors.base07}' + black: '0x${config.colorScheme.palette.base03}' + red: '0x${config.colorScheme.palette.base09}' + green: '0x${config.colorScheme.palette.base01}' + yellow: '0x${config.colorScheme.palette.base02}' + blue: '0x${config.colorScheme.palette.base04}' + magenta: '0x${config.colorScheme.palette.base06}' + cyan: '0x${config.colorScheme.palette.base0F}' + white: '0x${config.colorScheme.palette.base07}' draw_bold_text_with_bright_colors: false ''; diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix index 359730e..c336a09 100644 --- a/modules/desktop/desktop.nix +++ b/modules/desktop/desktop.nix @@ -63,7 +63,7 @@ in extraStartup = [ { command = "systemctl --user restart polybar"; always = true; notification = false; } - { command = "feh --bg-fill -B \"#${config.colorScheme.colors.base00}\" -z --no-fehbg ${cfg.wallpaper}"; always = true; notification = false; } + { command = "feh --bg-fill -B \"#${config.colorScheme.palette.base00}\" -z --no-fehbg ${cfg.wallpaper}"; always = true; notification = false; } ]; extraKeybindings = { diff --git a/modules/desktop/i3.nix b/modules/desktop/i3.nix index 06078a5..61b9784 100644 --- a/modules/desktop/i3.nix +++ b/modules/desktop/i3.nix @@ -208,34 +208,34 @@ in { # - Themeing --------------------------------- colors = { - background = "#${config.colorScheme.colors.base00}"; + background = "#${config.colorScheme.palette.base00}"; focused = { - border = "#${config.colorScheme.colors.base03}"; - background = "#${config.colorScheme.colors.base0B}"; - text = "#${config.colorScheme.colors.base03}"; - indicator = "#${config.colorScheme.colors.base04}"; - childBorder = "#${config.colorScheme.colors.base03}"; + border = "#${config.colorScheme.palette.base03}"; + background = "#${config.colorScheme.palette.base0B}"; + text = "#${config.colorScheme.palette.base03}"; + indicator = "#${config.colorScheme.palette.base04}"; + childBorder = "#${config.colorScheme.palette.base03}"; }; focusedInactive = { - border = "#${config.colorScheme.colors.base03}"; - background = "#${config.colorScheme.colors.base04}"; - text = "#${config.colorScheme.colors.base03}"; - indicator = "#${config.colorScheme.colors.base04}"; - childBorder = "#${config.colorScheme.colors.base03}"; + border = "#${config.colorScheme.palette.base03}"; + background = "#${config.colorScheme.palette.base04}"; + text = "#${config.colorScheme.palette.base03}"; + indicator = "#${config.colorScheme.palette.base04}"; + childBorder = "#${config.colorScheme.palette.base03}"; }; unfocused = { - border = "#${config.colorScheme.colors.base02}"; - background = "#${config.colorScheme.colors.base01}"; - text = "#${config.colorScheme.colors.base03}"; - indicator = "#${config.colorScheme.colors.base03}"; - childBorder = "#${config.colorScheme.colors.base02}"; + border = "#${config.colorScheme.palette.base02}"; + background = "#${config.colorScheme.palette.base01}"; + text = "#${config.colorScheme.palette.base03}"; + indicator = "#${config.colorScheme.palette.base03}"; + childBorder = "#${config.colorScheme.palette.base02}"; }; urgent = { - border = "#${config.colorScheme.colors.base02}"; - background = "#${config.colorScheme.colors.base0A}"; - text = "#${config.colorScheme.colors.base02}"; - indicator = "#${config.colorScheme.colors.base03}"; - childBorder = "#${config.colorScheme.colors.base02}"; + border = "#${config.colorScheme.palette.base02}"; + background = "#${config.colorScheme.palette.base0A}"; + text = "#${config.colorScheme.palette.base02}"; + indicator = "#${config.colorScheme.palette.base03}"; + childBorder = "#${config.colorScheme.palette.base02}"; }; }; }; diff --git a/modules/desktop/polybar.nix b/modules/desktop/polybar.nix index 3c77700..0d3ce70 100644 --- a/modules/desktop/polybar.nix +++ b/modules/desktop/polybar.nix @@ -38,22 +38,22 @@ in { # - Themeing --------------------------------- hm.xdg.configFile."polybar/colour-scheme.ini".text = '' [colour-scheme] - base00 = #${config.colorScheme.colors.base00} - base01 = #${config.colorScheme.colors.base01} - base02 = #${config.colorScheme.colors.base02} - base03 = #${config.colorScheme.colors.base03} - base04 = #${config.colorScheme.colors.base04} - base05 = #${config.colorScheme.colors.base05} - base06 = #${config.colorScheme.colors.base06} - base07 = #${config.colorScheme.colors.base07} - base08 = #${config.colorScheme.colors.base08} - base09 = #${config.colorScheme.colors.base09} - base0A = #${config.colorScheme.colors.base0A} - base0B = #${config.colorScheme.colors.base0B} - base0C = #${config.colorScheme.colors.base0C} - base0D = #${config.colorScheme.colors.base0D} - base0E = #${config.colorScheme.colors.base0E} - base0F = #${config.colorScheme.colors.base0F} + base00 = #${config.colorScheme.palette.base00} + base01 = #${config.colorScheme.palette.base01} + base02 = #${config.colorScheme.palette.base02} + base03 = #${config.colorScheme.palette.base03} + base04 = #${config.colorScheme.palette.base04} + base05 = #${config.colorScheme.palette.base05} + base06 = #${config.colorScheme.palette.base06} + base07 = #${config.colorScheme.palette.base07} + base08 = #${config.colorScheme.palette.base08} + base09 = #${config.colorScheme.palette.base09} + base0A = #${config.colorScheme.palette.base0A} + base0B = #${config.colorScheme.palette.base0B} + base0C = #${config.colorScheme.palette.base0C} + base0D = #${config.colorScheme.palette.base0D} + base0E = #${config.colorScheme.palette.base0E} + base0F = #${config.colorScheme.palette.base0F} ''; # - Dependencies ----------------------------- diff --git a/modules/desktop/rofi.nix b/modules/desktop/rofi.nix index db9a948..285bcc0 100644 --- a/modules/desktop/rofi.nix +++ b/modules/desktop/rofi.nix @@ -25,12 +25,12 @@ in hm.xdg.configFile."rofi/theme.rasi".text = '' * { font: "Iosevka Nerd Font 10"; - background: #${config.colorScheme.colors.base00}; - background-alt: #${config.colorScheme.colors.base02}; - foreground: #${config.colorScheme.colors.base05}; - selected: #${config.colorScheme.colors.base03}; - active: #${config.colorScheme.colors.base07}; - urgent: #${config.colorScheme.colors.base06}; + background: #${config.colorScheme.palette.base00}; + background-alt: #${config.colorScheme.palette.base02}; + foreground: #${config.colorScheme.palette.base05}; + selected: #${config.colorScheme.palette.base03}; + active: #${config.colorScheme.palette.base07}; + urgent: #${config.colorScheme.palette.base06}; } ''; diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix index 18137a2..110f4ae 100644 --- a/modules/editors/emacs.nix +++ b/modules/editors/emacs.nix @@ -7,7 +7,7 @@ let emacsPackages = epkgs: [ epkgs.vterm ]; - emacsWithPackages = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages emacsPackages); + emacsWithPackages = with pkgs; ((emacsPackagesFor emacs-unstable).emacsWithPackages emacsPackages); in { options.samfelag.modules.editors.emacs = { enable = mkEnableOption "emacs"; @@ -68,22 +68,22 @@ in { # "doom/themes/base16-samfelag-theme.el".text = '' # (require 'base16-theme) # (defvar base16-samfelag-theme-colors - # '(:base00 "#${config.colorScheme.colors.base00}" - # :base01 "#${config.colorScheme.colors.base01}" - # :base02 "#${config.colorScheme.colors.base02}" - # :base03 "#${config.colorScheme.colors.base03}" - # :base04 "#${config.colorScheme.colors.base04}" - # :base05 "#${config.colorScheme.colors.base05}" - # :base06 "#${config.colorScheme.colors.base06}" - # :base07 "#${config.colorScheme.colors.base07}" - # :base08 "#${config.colorScheme.colors.base08}" - # :base09 "#${config.colorScheme.colors.base09}" - # :base0A "#${config.colorScheme.colors.base0A}" - # :base0B "#${config.colorScheme.colors.base0B}" - # :base0C "#${config.colorScheme.colors.base0C}" - # :base0D "#${config.colorScheme.colors.base0D}" - # :base0E "#${config.colorScheme.colors.base0E}" - # :base0F "#${config.colorScheme.colors.base0F}") + # '(:base00 "#${config.colorScheme.palette.base00}" + # :base01 "#${config.colorScheme.palette.base01}" + # :base02 "#${config.colorScheme.palette.base02}" + # :base03 "#${config.colorScheme.palette.base03}" + # :base04 "#${config.colorScheme.palette.base04}" + # :base05 "#${config.colorScheme.palette.base05}" + # :base06 "#${config.colorScheme.palette.base06}" + # :base07 "#${config.colorScheme.palette.base07}" + # :base08 "#${config.colorScheme.palette.base08}" + # :base09 "#${config.colorScheme.palette.base09}" + # :base0A "#${config.colorScheme.palette.base0A}" + # :base0B "#${config.colorScheme.palette.base0B}" + # :base0C "#${config.colorScheme.palette.base0C}" + # :base0D "#${config.colorScheme.palette.base0D}" + # :base0E "#${config.colorScheme.palette.base0E}" + # :base0F "#${config.colorScheme.palette.base0F}") # "All colors for Base16 Samfelag are defined here.") # (deftheme base16-samfelag) # (base16-theme-define 'base16-samfelag base16-samfelag-theme-colors)