comparing 7bad95e21a5998046739ef101869de64ddc9cafe and main on nel.pet/cyclamen

+1

modules/nixos/system/default.nix

···

       3
       3
        
           ./bluetooth.nix

     

       4
       4
        
           ./boot

     

       5
       5
        
           ./lannas.nix

     

       6
       6
       +
           ./locale.nix

     

       6
       7
        
           ./printing.nix

     

       7
       8
        
         ];

     

       8
       9
        
       }

+17

modules/nixos/system/locale.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         time.timeZone = "Europe/Copenhagen";

     

       3
       3
       +
         i18n = {

     

       4
       4
       +
           defaultLocale = "en_GB.UTF-8"; # Use British english as the language

     

       5
       5
       +
           extraLocaleSettings = {        # But Danish for datetime formatting, measurements, etc. Basically everything else

     

       6
       6
       +
             LC_ADDRESS = "da_DK.UTF-8";

     

       7
       7
       +
             LC_IDENTIFICATION = "da_DK.UTF-8";

     

       8
       8
       +
             LC_MEASUREMENT = "da_DK.UTF-8";

     

       9
       9
       +
             LC_MONETARY = "da_DK.UTF-8";

     

       10
       10
       +
             LC_NAME = "da_DK.UTF-8";

     

       11
       11
       +
             LC_NUMERIC = "da_DK.UTF-8";

     

       12
       12
       +
             LC_PAPER = "da_DK.UTF-8";

     

       13
       13
       +
             LC_TELEPHONE = "da_DK.UTF-8";

     

       14
       14
       +
             LC_TIME = "da_DK.UTF-8";

     

       15
       15
       +
           };

     

       16
       16
       +
         };

     

       17
       17
       +
       }

-11

modules/home/vscode.nix

···

       6
       6
        
         programs.vscode = {

     

       7
       7
        
           enable = true;

     

       8
       8
        
           package = pkgs.vscode.overrideAttrs (final: prev: {

     

       9
       9
       -
             # Force vscode to run with the wayland backend to fix cursor theme issue.

     

       10
       10
       -
             # See https://github.com/NixOS/nixpkgs/issues/142764,

     

       11
       11
       -
             # https://www.reddit.com/r/NixOS/comments/17jeq1w/nix_packages_not_respecting_cursor_theme_nonnixos/ and

     

       12
       12
       -
             # https://discourse.nixos.org/t/please-help-fix-ugly-cursor-in-apps-installed-with-nix-env/11797

     

       13
       13
       -
             nativeBuildInputs = prev.nativeBuildInputs ++ [ pkgs.makeWrapper ];

     

       14
       14
       -
             postFixup = prev.postFixup + ''

     

       15
       15
       -
               mv $out/bin/code $out/bin/.code-wayland-wrapped

     

       16
       16
       -
               makeWrapper $out/bin/.code-wayland-wrapped $out/bin/code \

     

       17
       17
       -
                 --add-flags "--enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform-hint=auto --enable-wayland-ime"

     

       18
       18
       -
             '';

     

       19
       19
       -
       

     

       20
       9
        
             # Work around for https://github.com/NixOS/nixpkgs/issues/391341

     

       21
       10
        
             desktopItems = lib.map

     

       22
       11
        
               (i: if

+13 -1

modules/home/ssh.nix

···

       1
       1
        
       { config, ... }: {

     

       2
       2
        
         programs.ssh = {

     

       3
       3
        
           enable = true;

     

       4
       4
       -
           addKeysToAgent = "yes";

     

       4
       4
       +
           enableDefaultConfig = false;

     

       5
       5
        
           matchBlocks = {

     

       6
       6
       +
             "*" = {

     

       7
       7
       +
               forwardAgent = false;

     

       8
       8
       +
               addKeysToAgent = "yes";

     

       9
       9
       +
               compression = false;

     

       10
       10
       +
               serverAliveInterval = 0;

     

       11
       11
       +
               serverAliveCountMax = 3;

     

       12
       12
       +
               hashKnownHosts = false;

     

       13
       13
       +
               userKnownHostsFile = "~/.ssh/known_hosts";

     

       14
       14
       +
               controlMaster = "no";

     

       15
       15
       +
               controlPath = "~/.ssh/master-%r@%n:%p";

     

       16
       16
       +
               controlPersist = "no";

     

       17
       17
       +
             };

     

       6
       18
        
             "nixos-shell" = {

     

       7
       19
        
               hostname = "localhost";

     

       8
       20
        
               port = 2222;

+3 -4

modules/home/git.nix

···

       1
       1
       -
       { config, pkgs, inputs, ...}: let

     

       1
       1
       +
       { config, wrappers, ...}: let

     

       2
       2
        
         name = "nelind";

     

       3
       3
        
         email = "nel.n.lindberg@gmail.com";

     

       4
       4
        
         keyFile = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";

     
···

       20
       20
        
           lfs.enable = true;

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         home.packages = [ (inputs.wrappers.wrapperModules.jujutsu.apply {

     

       24
       24
       -
           inherit pkgs;

     

       23
       23
       +
         home.packages = [ (wrappers.jujutsu {

     

       25
       24
        
           settings = {

     

       26
       25
        
             ui = {

     

       27
       26
        
               default-command = [ "log" ];

     
···

       43
       42
        
               fetch = [ "origin" "upstream" ];

     

       44
       43
        
             };

     

       45
       44
        
           };

     

       46
       46
       -
         }).wrapper ];

     

       45
       45
       +
         }) ];

     

       47
       46
        
       }

+5

modules/home/wrappers.nix

···

       1
       1
       +
       # Convenience to make using the wrappers easier

     

       2
       2
       +
       { lib, pkgs, inputs, ...}: {

     

       3
       3
       +
         config._module.args.wrappers = 

     

       4
       4
       +
           lib.mapAttrs (name: wrapper: conf: (wrapper.apply (conf // { inherit pkgs; })).wrapper) inputs.wrappers.wrapperModules;

     

       5
       5
       +
       }

+13

modules/home/helix/layout.kdl

···

       1
       1
       +
       // Zellij layout for an IDE like interface around helix with terminal, treeview and helix itself

     

       2
       2
       +
       layout {

     

       3
       3
       +
           pane split_direction="vertical" {

     

       4
       4
       +
               pane size=35 command="broot"

     

       5
       5
       +
               pane split_direction="horizontal" {

     

       6
       6
       +
                   pane command="hx"

     

       7
       7
       +
                   pane size="25%" name="term"

     

       8
       8
       +
               }

     

       9
       9
       +
           }

     

       10
       10
       +
           pane size=1 borderless=true {

     

       11
       11
       +
               plugin location="status-bar"

     

       12
       12
       +
           }

     

       13
       13
       +
       }

+3 -17

flake.lock

···

       37
       37
        
               "type": "github"

     

       38
       38
        
             }

     

       39
       39
        
           },

     

       40
       40
       -
           "nixpkgs_2": {

     

       41
       41
       -
             "locked": {

     

       42
       42
       -
               "lastModified": 1758690382,

     

       43
       43
       -
               "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",

     

       44
       44
       -
               "owner": "NixOS",

     

       45
       45
       -
               "repo": "nixpkgs",

     

       46
       46
       -
               "rev": "e643668fd71b949c53f8626614b21ff71a07379d",

     

       47
       47
       -
               "type": "github"

     

       48
       48
       -
             },

     

       49
       49
       -
             "original": {

     

       50
       50
       -
               "owner": "NixOS",

     

       51
       51
       -
               "ref": "nixos-unstable",

     

       52
       52
       -
               "repo": "nixpkgs",

     

       53
       53
       -
               "type": "github"

     

       54
       54
       -
             }

     

       55
       55
       -
           },

     

       56
       40
        
           "root": {

     

       57
       41
        
             "inputs": {

     

       58
       42
        
               "home-manager": "home-manager",

     
···

       62
       46
        
           },

     

       63
       47
        
           "wrappers": {

     

       64
       48
        
             "inputs": {

     

       65
       65
       -
               "nixpkgs": "nixpkgs_2"

     

       49
       49
       +
               "nixpkgs": [

     

       50
       50
       +
                 "nixpkgs"

     

       51
       51
       +
               ]

     

       66
       52
        
             },

     

       67
       53
        
             "locked": {

     

       68
       54
        
               "lastModified": 1763233857,

+11

modules/home/kitty/default.nix

···

       1
       1
       +
       { pkgs, inputs, ... }: {

     

       2
       2
       +
         home.packages = [

     

       3
       3
       +
           (inputs.wrappers.lib.wrapPackage {

     

       4
       4
       +
             inherit pkgs;

     

       5
       5
       +
             package = pkgs.kitty;

     

       6
       6
       +
             flags = {

     

       7
       7
       +
               "--config" = ./kitty.conf;

     

       8
       8
       +
             };

     

       9
       9
       +
           })

     

       10
       10
       +
         ];

     

       11
       11
       +
       }

+78

modules/home/kitty/kitty.conf

···

       1
       1
       +
       

     

       2
       2
       +
       ## Theme

     

       3
       3
       +
       ## name:     Catppuccin Kitty Mocha

     

       4
       4
       +
       ## author:   Catppuccin Org

     

       5
       5
       +
       ## license:  MIT

     

       6
       6
       +
       ## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf

     

       7
       7
       +
       ## blurb:    Soothing pastel theme for the high-spirited!

     

       8
       8
       +
       

     

       9
       9
       +
       # The basic colors

     

       10
       10
       +
       foreground              #cdd6f4

     

       11
       11
       +
       background              #1e1e2e

     

       12
       12
       +
       selection_foreground    #1e1e2e

     

       13
       13
       +
       selection_background    #f5e0dc

     

       14
       14
       +
       

     

       15
       15
       +
       # Cursor colors

     

       16
       16
       +
       cursor                  #f5e0dc

     

       17
       17
       +
       cursor_text_color       #1e1e2e

     

       18
       18
       +
       

     

       19
       19
       +
       # URL underline color when hovering with mouse

     

       20
       20
       +
       url_color               #f5e0dc

     

       21
       21
       +
       

     

       22
       22
       +
       # Kitty window border colors

     

       23
       23
       +
       active_border_color     #b4befe

     

       24
       24
       +
       inactive_border_color   #6c7086

     

       25
       25
       +
       bell_border_color       #f9e2af

     

       26
       26
       +
       

     

       27
       27
       +
       # OS Window titlebar colors

     

       28
       28
       +
       wayland_titlebar_color system

     

       29
       29
       +
       macos_titlebar_color system

     

       30
       30
       +
       

     

       31
       31
       +
       # Tab bar colors

     

       32
       32
       +
       active_tab_foreground   #11111b

     

       33
       33
       +
       active_tab_background   #cba6f7

     

       34
       34
       +
       inactive_tab_foreground #cdd6f4

     

       35
       35
       +
       inactive_tab_background #181825

     

       36
       36
       +
       tab_bar_background      #11111b

     

       37
       37
       +
       

     

       38
       38
       +
       # Colors for marks (marked text in the terminal)

     

       39
       39
       +
       mark1_foreground #1e1e2e

     

       40
       40
       +
       mark1_background #b4befe

     

       41
       41
       +
       mark2_foreground #1e1e2e

     

       42
       42
       +
       mark2_background #cba6f7

     

       43
       43
       +
       mark3_foreground #1e1e2e

     

       44
       44
       +
       mark3_background #74c7ec

     

       45
       45
       +
       

     

       46
       46
       +
       # The 16 terminal colors

     

       47
       47
       +
       

     

       48
       48
       +
       # black

     

       49
       49
       +
       color0 #45475a

     

       50
       50
       +
       color8 #585b70

     

       51
       51
       +
       

     

       52
       52
       +
       # red

     

       53
       53
       +
       color1 #f38ba8

     

       54
       54
       +
       color9 #f38ba8

     

       55
       55
       +
       

     

       56
       56
       +
       # green

     

       57
       57
       +
       color2  #a6e3a1

     

       58
       58
       +
       color10 #a6e3a1

     

       59
       59
       +
       

     

       60
       60
       +
       # yellow

     

       61
       61
       +
       color3  #f9e2af

     

       62
       62
       +
       color11 #f9e2af

     

       63
       63
       +
       

     

       64
       64
       +
       # blue

     

       65
       65
       +
       color4  #89b4fa

     

       66
       66
       +
       color12 #89b4fa

     

       67
       67
       +
       

     

       68
       68
       +
       # magenta

     

       69
       69
       +
       color5  #f5c2e7

     

       70
       70
       +
       color13 #f5c2e7

     

       71
       71
       +
       

     

       72
       72
       +
       # cyan

     

       73
       73
       +
       color6  #94e2d5

     

       74
       74
       +
       color14 #94e2d5

     

       75
       75
       +
       

     

       76
       76
       +
       # white

     

       77
       77
       +
       color7  #bac2de

     

       78
       78
       +
       color15 #a6adc8

Compare changes