Trying out cosmic again!
Signed-off-by: MLC Bloeiman <mar@strawmelonjuice.com>
+129
-45
+1
-1
configs/nvim/lua/config/keymaps.lua
+1
-1
configs/nvim/lua/config/keymaps.lua
···
89
89
local row, _ = unpack(vim.api.nvim_win_get_cursor(0))
90
90
91
91
-- make "-----------" seperator line at consitent length
92
-
local seperator = string.rep("-", 80 - string.len(line))
92
+
local seperator = string.rep("-", 120 - string.len(line))
93
93
94
94
-- write line with seperator to current buffer at current cursor position
95
95
vim.api.nvim_buf_set_lines(0, row - 1, row, true, { line .. " " .. seperator })
+36
-36
flake.lock
+36
-36
flake.lock
···
8
8
},
9
9
"locked": {
10
10
"dir": "pkgs/firefox-addons",
11
-
"lastModified": 1774411399,
12
-
"narHash": "sha256-Qi3kg32UZe3eydNCrNMbKblBRM7OB+m+IQsL9uxlzPQ=",
11
+
"lastModified": 1774843378,
12
+
"narHash": "sha256-8QLbY8F7UdxeQaW0KUVgr1/YPIupe+1lGjS5joR+ZCw=",
13
13
"owner": "rycee",
14
14
"repo": "nur-expressions",
15
-
"rev": "12af22aad517da1a19bf860e63666d063c1bc7b6",
15
+
"rev": "0a31b668e3ebb599f95dc518076d709e8dddb57c",
16
16
"type": "gitlab"
17
17
},
18
18
"original": {
···
29
29
]
30
30
},
31
31
"locked": {
32
-
"lastModified": 1774379316,
33
-
"narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
32
+
"lastModified": 1774898676,
33
+
"narHash": "sha256-0Utnqo+FbB+0CVUi0MI3oonF0Kuzy9VcgRkxl53Euvk=",
34
34
"owner": "nix-community",
35
35
"repo": "home-manager",
36
-
"rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
36
+
"rev": "a184bd2f8426087bae93f203403cd4b86c99e57d",
37
37
"type": "github"
38
38
},
39
39
"original": {
···
52
52
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
53
53
},
54
54
"locked": {
55
-
"lastModified": 1774283383,
56
-
"narHash": "sha256-3aCfmL8hOcdIl783LTnK+lHcjMGCnc+2zQ98xUyefCU=",
55
+
"lastModified": 1774921404,
56
+
"narHash": "sha256-oHqaEduwYqXx3itq7ckP+iuC9nU6DzfCVery4YhUjAU=",
57
57
"owner": "sodiboo",
58
58
"repo": "niri-flake",
59
-
"rev": "8a583029606cf072cc01c7e2f4298cc75a7ada28",
59
+
"rev": "3d02f5c53d09af97a7d66065b8c058d0599bc547",
60
60
"type": "github"
61
61
},
62
62
"original": {
···
85
85
"niri-unstable": {
86
86
"flake": false,
87
87
"locked": {
88
-
"lastModified": 1773130184,
89
-
"narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=",
88
+
"lastModified": 1774616418,
89
+
"narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=",
90
90
"owner": "YaLTeR",
91
91
"repo": "niri",
92
-
"rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea",
92
+
"rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee",
93
93
"type": "github"
94
94
},
95
95
"original": {
···
100
100
},
101
101
"nixpkgs": {
102
102
"locked": {
103
-
"lastModified": 1774106199,
104
-
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
103
+
"lastModified": 1774709303,
104
+
"narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
105
105
"owner": "NixOS",
106
106
"repo": "nixpkgs",
107
-
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
107
+
"rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
108
108
"type": "github"
109
109
},
110
110
"original": {
···
116
116
},
117
117
"nixpkgs-stable": {
118
118
"locked": {
119
-
"lastModified": 1774244481,
120
-
"narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
119
+
"lastModified": 1774799055,
120
+
"narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=",
121
121
"owner": "NixOS",
122
122
"repo": "nixpkgs",
123
-
"rev": "4590696c8693fea477850fe379a01544293ca4e2",
123
+
"rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a",
124
124
"type": "github"
125
125
},
126
126
"original": {
···
132
132
},
133
133
"nixpkgs-stable_2": {
134
134
"locked": {
135
-
"lastModified": 1774244481,
136
-
"narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
135
+
"lastModified": 1774799055,
136
+
"narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=",
137
137
"owner": "nixos",
138
138
"repo": "nixpkgs",
139
-
"rev": "4590696c8693fea477850fe379a01544293ca4e2",
139
+
"rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a",
140
140
"type": "github"
141
141
},
142
142
"original": {
···
148
148
},
149
149
"nixpkgs_2": {
150
150
"locked": {
151
-
"lastModified": 1774106199,
152
-
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
151
+
"lastModified": 1774709303,
152
+
"narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
153
153
"owner": "nixos",
154
154
"repo": "nixpkgs",
155
-
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
155
+
"rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
156
156
"type": "github"
157
157
},
158
158
"original": {
···
170
170
"noctalia-qs": "noctalia-qs"
171
171
},
172
172
"locked": {
173
-
"lastModified": 1774400959,
174
-
"narHash": "sha256-DRbKRBvsxNMIdVoViEvUZqy0z9ivSP0IqdYJgMjorQ0=",
173
+
"lastModified": 1774920276,
174
+
"narHash": "sha256-nynVyNuy8SDh2nZWfeov6RAhvsaTAeAQHZog7lBK+A0=",
175
175
"owner": "noctalia-dev",
176
176
"repo": "noctalia-shell",
177
-
"rev": "e4158c7d81af37efa2c1c2730f94b24b3c343fcd",
177
+
"rev": "421ccc4c87228878b0eb29d3d1faead875c49c28",
178
178
"type": "github"
179
179
},
180
180
"original": {
···
193
193
"treefmt-nix": "treefmt-nix"
194
194
},
195
195
"locked": {
196
-
"lastModified": 1774351986,
197
-
"narHash": "sha256-N131zILQ06ZNEvtgtjjFZ0N5qEI70rKKhCZsBcZoDH8=",
196
+
"lastModified": 1774902752,
197
+
"narHash": "sha256-WC3SgVJX+N78KnRf1v9Z2VowkJBc9SBKpaZsWxWm/Rs=",
198
198
"owner": "noctalia-dev",
199
199
"repo": "noctalia-qs",
200
-
"rev": "066835ebd5daeabc86df1e62fb5fe82a51407cc0",
200
+
"rev": "4f0ceff244748ec55cfccc4f674759a7a2941b18",
201
201
"type": "github"
202
202
},
203
203
"original": {
···
216
216
]
217
217
},
218
218
"locked": {
219
-
"lastModified": 1772361940,
220
-
"narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=",
219
+
"lastModified": 1774915545,
220
+
"narHash": "sha256-COT4l/+ZddGBvrDVfPf7MEOJxV8EDKame6/aRnNIKcY=",
221
221
"owner": "nix-community",
222
222
"repo": "plasma-manager",
223
-
"rev": "a4b33606111c9c5dcd10009042bb710307174f51",
223
+
"rev": "f3177b3c69fb3f03201098d7fe8ab6422cce7fc1",
224
224
"type": "github"
225
225
},
226
226
"original": {
···
264
264
]
265
265
},
266
266
"locked": {
267
-
"lastModified": 1772660329,
268
-
"narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=",
267
+
"lastModified": 1773297127,
268
+
"narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=",
269
269
"owner": "numtide",
270
270
"repo": "treefmt-nix",
271
-
"rev": "3710e0e1218041bbad640352a0440114b1e10428",
271
+
"rev": "71b125cd05fbfd78cab3e070b73544abe24c5016",
272
272
"type": "github"
273
273
},
274
274
"original": {
+3
flake.nix
+3
flake.nix
···
30
30
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
31
31
inputs.nixpkgs.follows = "nixpkgs";
32
32
};
33
+
34
+
33
35
};
34
36
outputs =
35
37
{
···
39
41
...
40
42
}@inputs:
41
43
let
44
+
42
45
# Helper function to create system configs easily
43
46
mkSystem =
44
47
hostname: system:
+1
home/home.nix
+1
home/home.nix
+62
home/modules/cosmic.nix
+62
home/modules/cosmic.nix
···
1
+
# Okay. Since flakes and stuff work shitty here, linking files from this module.
2
+
#
3
+
# God this is a lot of pain lol
4
+
# AND SO INCONSISTENT!
5
+
#
6
+
# But doable.
7
+
# I'll add more when I can, we so far had the modules:
8
+
# - com.system76.CosmicBackground
9
+
# - com.system76.CosmicComp
10
+
#
11
+
# Current source of initial config: Ponyta
12
+
{ ... }:
13
+
{
14
+
# com.system76.CosmicBackground -------------------------------------------------
15
+
xdg.configFile."cosmic/com.system76.CosmicBackground/v1/all".text = ''
16
+
(
17
+
output: "all",
18
+
source: Path("/home/mar/.local/share/wallpapers/current_wallpaper.png"),
19
+
filter_by_theme: true,
20
+
rotation_frequency: 300,
21
+
filter_method: Lanczos,
22
+
scaling_mode: Zoom,
23
+
sampling_method: Alphanumeric,
24
+
)
25
+
'';
26
+
27
+
xdg.configFile."cosmic/com.system76.CosmicBackground/v1/same-on-all".text = "true";
28
+
29
+
# com.system76.CosmicComp -------------------------------------------------------
30
+
xdg.configFile."cosmic/com.system76.CosmicComp/v1/autotile".text = "true";
31
+
xdg.configFile."cosmic/com.system76.CosmicComp/v1/autotile_behavior".text = "PerWorkspace";
32
+
xdg.configFile."cosmic/com.system76.CosmicComp/v1/cursor_follows_focus".text = "true";
33
+
xdg.configFile."cosmic/com.system76.CosmicComp/v1/focus_follows_cursor".text = "true";
34
+
xdg.configFile."cosmic/com.system76.CosmicComp/v1/edge_snap_threshold".text = "10";
35
+
xdg.configFile."cosmic/com.system76.CosmicComp/v1/input_touchpad".text = ''
36
+
(
37
+
state: Enabled,
38
+
click_method: Some(Clickfinger),
39
+
scroll_config: Some((
40
+
method: Some(TwoFinger),
41
+
natural_scroll: Some(true),
42
+
scroll_button: None,
43
+
scroll_factor: None,
44
+
)),
45
+
tap_config: Some((
46
+
enabled: true,
47
+
button_map: Some(LeftRightMiddle),
48
+
drag: true,
49
+
drag_lock: false,
50
+
)),
51
+
)
52
+
'';
53
+
54
+
xdg.configFile."cosmic/com.system76.CosmicComp/v1/workspaces".text = ''
55
+
(
56
+
workspace_mode: OutputBound,
57
+
workspace_layout: Vertical,
58
+
action_on_typing: OpenLauncher,
59
+
)
60
+
'';
61
+
# ignored: cosmic/com.system76.CosmicComp/v1/xkb_config, since this is auto-setup and per-device I feel.
62
+
}
+7
-3
home/modules/gnome.nix
+7
-3
home/modules/gnome.nix
···
44
44
always-center-icons = true;
45
45
apply-custom-theme = true;
46
46
background-opacity = 0.80000000000000004;
47
+
custom-theme-shrink = true;
48
+
isolate-workspaces = true;
47
49
dash-max-icon-size = 48;
48
50
dock-fixed = false;
49
51
dock-position = "BOTTOM";
50
-
extend-height = true;
52
+
# Means extend width in my case btw
53
+
extend-height = false;
51
54
height-fraction = 0.90000000000000002;
52
55
icon-size-fixed = false;
53
56
scroll-action = "switch-workspace";
···
55
58
show-thrash = false;
56
59
};
57
60
"org/gnome/desktop/background" = {
58
-
picture-uri = "file:///home/mar/.local/share/wallpapers/aesthetic-wallpapers/images/pink-clouds.png";
59
-
picture-uri-dark = "file:///home/mar/.local/share/wallpapers/aesthetic-wallpapers/images/wallhaven-9mjw78.png";
61
+
picture-uri = "file:///home/mar/.local/share/wallpapers/current_wallpaper.png";
62
+
# Hoping my systemd service works for gnome too
63
+
picture-uri-dark = "file:///home/mar/.local/share/wallpapers/current_wallpaper.png";
60
64
picture-options = "zoom"; # "zoom", "centered", "scaled", etc.
61
65
};
62
66
"org/gnome/desktop/screensaver" = {
+2
-2
hosts/Ponyta/configuration.nix
+2
-2
hosts/Ponyta/configuration.nix
···
46
46
LC_TELEPHONE = "nl_NL.UTF-8";
47
47
LC_TIME = "nl_NL.UTF-8";
48
48
};
49
-
# Default session niri.
50
-
services.displayManager.defaultSession = "niri";
49
+
# Default session ~~niri~~ Cosmic
50
+
services.displayManager.defaultSession = "cosmic";
51
51
52
52
# Configure keymap in X11
53
53
services.xserver.xkb = {
+17
-3
hosts/all-hosts.nix
+17
-3
hosts/all-hosts.nix
···
76
76
# Enable the X11 windowing system.
77
77
services.xserver.enable = true;
78
78
79
-
# Enable the GNOME Desktop Environment, Niri and KDE. I like to be able to switch whenever.
79
+
# Enable the GNOME Desktop Environment, Niri and Cosmic. I like to be able to switch whenever.
80
80
services.displayManager.gdm.enable = true;
81
81
services.desktopManager.gnome.enable = true;
82
-
# services.desktopManager.plasma6.enable = true;
83
82
programs.ssh.askPassword = lib.mkForce "${pkgs.gnome-themes-extra}/libexec/seahorse/ssh-askpass";
84
83
programs.niri.enable = true;
85
84
services.gnome.gnome-keyring.enable = true;
86
85
security.pam.services.mar.enableGnomeKeyring = true;
86
+
87
+
services.desktopManager.cosmic.enable = true;
88
+
services.system76-scheduler.enable = true;
89
+
environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
90
+
environment.sessionVariables.XDG_CURRENT_DESKTOP = "cosmic";
91
+
environment.cosmic.excludePackages = with pkgs; [
92
+
cosmic-edit
93
+
cosmic-store
94
+
];
95
+
# services.desktopManager.plasma6.enable = true;
96
+
97
+
# Keep nix store to a reasonable size
87
98
nix.gc = {
88
99
automatic = true;
89
100
dates = "weekly";
···
110
121
security.sudo.enable = false;
111
122
security.doas.extraRules = [
112
123
{
113
-
users = [ "mar" ];
124
+
users = [
125
+
"mar"
126
+
"root"
127
+
];
114
128
keepEnv = true;
115
129
noPass = true;
116
130
}